Backed out changesets 0047417b0635 and 5729545971af (bug 887502) for test failures.