Fix #2197   There is no wait forever option, so we actually need a timeout.