Revert r30164: it was just the wrong thing to do.

Fixes #4155.