Backed out changesets 3bc917772c0d and d3b6c8598542 (bug 1042791) for mochitest failures.