Revert pull request #84085

Test plan: none

Auditors: jack