Revert "Merge branch 'mk-grpc-1.42' into 'master'"

This reverts commit 1a173fd8, reversing changes made to 9388cf42.

Since we don't have a clear path for deploying both Gitaly and GitLab together safely, (see context in gitlab!74987 (merged)), reverting this until we have a strategy for deployment so Gitaly auto deploys can be resumed.