Issue #28701: Revert part of 5bdc8e1a50c8 for the following reasons:

- There was no real problem to begin with.

  - The hypothetical problem has been fixed by 5bdc8e1a50c8.