Merge branch 'revert-305827ad' into 'master'

Revert !129651 from master

Closes gitlab-com/gl-infra/production#16260

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



Merged-by: Alper Akgun <aakgun@gitlab.com>
Approved-by: Alper Akgun <aakgun@gitlab.com>
Co-authored-by: Mayra Cabrera <mcabrera@gitlab.com>