This is the missing EE-port for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32425.
fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/14054