Revert "Connecting between servers handled by client success"

This reverts commit 8001cc9c5e6f98b882794f354c5dd856ce5a703a.