We don't really want to ship what we have as a contract. As an emergency measure we are making it into internal extension methods so we can have a do-over in 2.1.