More compliant timeout, work around choco bug 371