Merge branch 'revert-b817673a' into 'master'

Revert "Merge branch 'revert-352c21f2' into 'master'"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126465



Merged-by: Jose Ivan Vargas <jvargas@gitlab.com>
Approved-by: Jose Ivan Vargas <jvargas@gitlab.com>
Co-authored-by: Phil Hughes <me@iamphill.com>