I think we should be able to delete the rest of this package, shouldn't we? And probably add a comment here that we have this here for back-compat/upgrade path.