Revert commits r222146 and r222137.