Revert "Merge branch 'mh/net-mocks-2' into 'master'"
reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29272 because it fails on EE: https://gitlab.com/gitlab-org/gitlab-ee/issues/12909
Edited by Inactive Account
reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29272 because it fails on EE: https://gitlab.com/gitlab-org/gitlab-ee/issues/12909