backing out e10s patch: 6c74679e60bb
merges backout 6c74679e60bb -> default