Backed out changeset 226af3342987 (bug 952330) for ggc orange