Note that we don't want to backport this any further without some other fixes related to a regression it caused, see bug 1803717.
Note that we don't want to backport this any further without some other fixes related to a regression it caused, see bug 1803717.