Backport fix for Bug#8672 from trunk