Backed out changeset df60c0297aa2 (bug 1100652) for ggc orange