fix another bug: timeouts were broken
merge bug25356 into default