Revert "Merge branch 'revert-9c7cf5e1' into 'master'"
This reverts merge request !28085 (merged) (the MR that broke this change has now been fixed by !27982 (merged))
This reverts merge request !28085 (merged) (the MR that broke this change has now been fixed by !27982 (merged))