Not for this patch, but it'd be nice if we didn't make other faster systems timeout at the speed of the slowest system.