Revert "Merge branch 'revert-bb052c85' into 'master'"

This reverts merge request !6857 (merged)

Continuing to see stuck Gitaly processes during deployments gitlab-com/gl-infra/production#17941 (closed)