Backed out changesets 73188e11f7b1 and 7111c04c1158 (bug 896353) for mochitest-1 crashes.