It reverts https://gitlab.com/gitlab-org/gitlab-ee/commit/df752b415dfbf7d97300835eae2f5500a2126352
/cc @smcgivern
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1331 EE master
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9614 CE master