Packages now replace the old variants.