Revert most of r53392 effects.