after some minor mods. Fixes #803498, but should NOT be backported because
the original problem seems to be unreproducable.