As described in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18738 there is a problem and the larger fix may take longer so we can just revert this small change for now