Backed out changesets 2238918d2c5c and b0b81ad1198d (bug 894793) for mozmill test failures. DONTBUILD