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