Back out 0bbb5cacadaf (bug 694254) for timing out on Windows