Rollback some GC changes