Fixes master:broken
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10636
Related https://gitlab.com/gitlab-org/gitlab-ce/issues/59346