Revert "Another attempt to make the connection work"

This reverts commit 28fc53d5dfe4534f5f5a5fccfa366892f700824c.
Small Changes