So, at what point do we deprecate the old one? seems like we should have renamed the original `old_resource_descriptor`. Seems like some TODO to clean this up?