Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/28868
Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/20545