Revert r92864 per discussion on CR