Backed out 2 changesets (bug 832700) for mochitest-2 bustage

Backed out changeset 9d6312427933 (bug 832700)
Backed out changeset 660b7e69fac7 (bug 832700)