Revert r219832.