Backed out changeset 74c69cc22c4b (bug 835698) for causing bug 839256. a=backout