Backout changeset 4e6b39fbd81e (bug 951722) for ggc orange