Back out 85f522534c5a (bug 829456) for apparently causing frequent failures in test_bug607464.html
CLOSED TREE