Backed out changeset 4c129a5676eb (bug 871485) for mochitest-1 failures.