Revert r179420 and r179421.