Reverts https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2004 because of https://gitlab.com/gitlab-org/gitlab-ee/issues/2738.
Proper fix on the works in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2240.
Reverts https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2004 because of https://gitlab.com/gitlab-org/gitlab-ee/issues/2738.
Proper fix on the works in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2240.