Adapting to new package infrastructure.