Revert "Merge branch 'revert-mr-54089-incident-3632' into 'master'"

See merge request gitlab-org/gitlab!54296