This was originally in #105026, but then 5.30.1 happened with this change included, so there were conflict and the patch got dropped. Let's introduce it separately for only one version that still needs it.
