Backed out changeset f2c22a19e349 (bug 769348) until it bakes on m-c longer. a=backout