Revert breaking change to stable Terraform template

Purpose of revert

This reverts half the change in !119158 (merged). We can make breaking changes to latest templates at any time, but we shouldn't make breaking changes to the stable branches without a warning ahead of time, and it should be done in a major milestone.

This has broke user pipelines, see related issue. We should merge soon to make sure it doesn't roll out to self-managed as well.

• Related to #415459 (closed)
• Related to gitlab-com/gl-infra/production#15836 (closed)

Checklist

• Create an issue to reinstate the merge request and assign it to the author of the reverted merge request.
• If the revert is to resolve a broken 'master' incident, please read through the Responsibilities of the Broken master resolution DRI.
• If the revert involves a database migration, please read through Deleting existing migrations.
• 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