Revert 3f3f256e1abe2a7795ba89ff6b84d4b81fb0a7e2.

On reflection, 3f3f256e1abe2a7795ba89ff6b84d4b81fb0a7e2 seems like a bad
idea.  It's unnecessary, and risks unforeseen consequences.