Backed out changesets 7bfa96b421ea and da9faa259da1 (bug 1095506) for mochitest-bc failures.