tolerate timeouts
merge bug25571 into stable