Backport of gh-33013

Comment From: github-actions[bot]

Fixed via dffb6c5bb6c7a8b60ee6ab0f3ddd9edb40e378e2

Comment From: sbrannen

Due to #33315, we have decided to revert the backport of #33013 to 5.3.38 and 6.0.23.

Comment From: sbrannen

Reverted in commit 351a17a28be11a5d4545f51d271ff921b133bf61.