I don't think we need this to be public api. Can you make it internal?