Backport from trunk: Fix bug #6126.