Merge "Don't use an internal timeout, rely on the test harness one."