Backed out changesets 6deb17bc6c56 and 7952fadd1732 (bug 839280) for mochitest-other crashes.