Revert r90678 per CR