Backport fix for Bug#11989 from trunk.