Back out 712628797f21 (bug 946976) for ggc orange