Backport Bug#9990 fix from trunk