Revert "Merge branch 'revert-a87cd883' into 'master'"

Purpose of revert

Checklist

• Create an issue to reinstate the merge request and assign it to the author of the reverted merge request. #389413 (closed)
• [-] If the revert is to resolve a broken 'master' incident, please read through the Responsibilities of the Broken master resolution DRI.
• Add the appropriate labels before the MR is created. We can skip CI/CD jobs only if the labels are added before the CI/CD pipeline is created.

Milestone info

• I am reverting something in the current milestone. No changelog is needed, and I've added a ~"regression:*" label.
• [-] I am reverting something in a different milestone. A changelog is needed, and I've removed the ~"regression:*" label.

Related issues and merge requests

This change was original merged: !109008 (merged) and then reverted when this incident occurred: gitlab-com/gl-infra/production#8292 (closed)

The feature flag was accidentally turned on before the MR was in production which caused this incident.