Removed old code and re-added auto-reconnect.