EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30350
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/44496