Merge branch 'revert-c58a3b6e' into 'master'

Revert !149690 into 'master'"

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Gregorius Marco <gmarco@gitlab.com>