Does this need to be part of the public API?