Backed out changeset b26c709330d6 (bug 1069962). r=paolo.