This reverts commit 47ad7d3131. The fix isn't needed after the update contained in PR #89632.
47ad7d3131