This reverts commit de122cb9. This change causes assertion failures in many of our internal tests. I have filed #60280 for this issue.