Revert r74978 per CR, no followup for nearly 2 months