Backout da88cd4bc6db & 696264e2414c (bug 569356) for intermittent, but frequent test_doc_busy.html timeouts