Backport fix for Bug#5723 from trunk.