Timeout is now explicit as the default caused lots of confusion (to me anyhow!).