Merge branch 'revert-e66ffccc' into 'master'

Revert 397067

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



Merged-by: Peter Leitzen <pleitzen@gitlab.com>
Approved-by: Russell Dickenson <rdickenson@gitlab.com>
Approved-by: Philip Cunningham <pcunningham@gitlab.com>
Approved-by: Peter Leitzen <pleitzen@gitlab.com>
Co-authored-by: Alexander Turinske <aturinske@gitlab.com>