Revert r30254.

Fixes #4156.