Revert r64436, r64437, r64508 per CR r64436