What does this MR do?
Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24801/ because of https://gitlab.com/gitlab-org/gitlab-ee/issues/9621.
Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24801/ because of https://gitlab.com/gitlab-org/gitlab-ee/issues/9621.