EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25432#note_147391489
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54670