acu151452 - Make default timeouts the same as their previous behavior.