Backing out bug 837815, changeset 64df2203966e, r=me