Revert r53454, since it causes much sadness in this world.