Removed some backwards compatibility shims for private API.