SWPY-23: Better reconnect code, maybe