Backed out changesets 64c7ba1d3d04 and 7e9d5bb4a9af (bug 862986) for test failures.