Backed out changeset ac10d2fcb25d (bug 969375) for ggc testfailures