Backed out changesets e8b0b4daa733 and d89066cb6f59 (bug 853972) for mochitest-bc timeouts.