Backed out changeset 39778c27c5fd (bug 951213) for causing ggc orange
Backed out changeset 4c45705d14c4 (reland bug 952330 since it wasn't at fault for the ggc orange)