Revert r170413 and r170390