Backport fix for Bug#6170 from trunk.