Redid patch for radix_core.