Backport of gh-33013

Comment From: github-actions[bot]

Fixed via d33f66d9b5865d7eb76cfde70e93a25f23c5e4fb

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 e11a419cc32a5c680070d7e7199e5c2a833cb94c.