Backport fix for Bug#8219 from trunk.