Revert r178713