Add reconnect/restart logic again in discovery. Avoid recursion