switch back to previous implementation for connection