Revert commit r219835 and r219829.