Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23381 because of https://gitlab.com/gitlab-org/gitlab-ee/issues/8396#note_123643963.