WHISTLE-1886: simplified re-connect strategy