Revert r256277 and r256279.