Fix CI for master branch
it reverts the commits that were mistakenly pushed directly to master. They are not ready yet https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11637
it reverts the commits that were mistakenly pushed directly to master. They are not ready yet https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11637