Backed out changeset 64ec5c15d182 (bug 1107496) for SM(ggc) orange.