Backport from trunk: Fix bug#6298.