Resolve technical debt from gitlab-org/gitlab-ee!1437

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1437#note_25892287