This reverts commit f8cd24de in an attempt to re-land it.

There are no changes in this PR from #74373, since it only failed Google internal tests, and we think that the solution involves updating those tests instead of changing this code.