It might be good to land as a precursor API for a smaller diff and better scoped PR (only adding a new feature, vs adding a new feature and removing a feature in the same PR)