Improvement over https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3672.
For https://gitlab.com/gitlab-org/gitlab-ee/issues/3724