Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12148, kinda.
EE port: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2295