Backed out changeset 88a641ee5cbe (bug 1007057) for frequent test timeouts.
CLOSED TREE