revert r113117 per CR