Self revert r95041 per CR. I will commit a cleaner patch.