Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"

Closes gitlab-qa#287

See merge request gitlab-org/gitlab-ee!6389