Backed out changeset 27cb26c18799 (bug 1064669). r=mfinkle a=bustage