Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41178

Regressed in CE->EE MR because it wasn't condidered to be
a conflict by git, see
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3633/diffs#f945183105ed1222efad338f5edfc05b00f59c56_28_28