Should we really break the public API?