Revert r194865 and r194874.