Revert "Merge branch 'revert-19211f3d' into 'master'" [RUN AS-IF-FOSS]

Closes #259075

See merge request gitlab-org/gitlab!43948