WIP: Tentative fix for EE issue 11735 (Meaningful changes are in EE)
What does this MR do?
This is the CE side of the changes in the EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13387
Edited by Ben McCormick
This is the CE side of the changes in the EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13387