Revert "Merge branch 'jc-revert-414c9b7c' into 'master'"

This reverts commit d4f6083d, reversing changes made to 414c9b7c.

414c9b7c broke CI because we didn't change the setup helper on gitlab to include the required config fields.

gitlab!33578 (merged) fixes that by adding the necessary fields.

https://gitlab.com/gitlab-org/gitlab/pipelines/152081937 is a pipeline run with this gitaly branch to ensure that tests pass. (danger fails, but everything else passes)