backout changesets d8f3694dd6df (bug 871961 pt 2) and b77d5e403c3d (bug 871961 pt 4) for making the browser crashy. r=me