We received positive feedback from that change, so we decided to backport #34673 to the main supported version.

Comment From: github-actions[bot]

Fixed via 24e66b63d1d12c45e4af333d6271451083f81e90