trq-2072 put in a small timeout even when no wait is specified.