Fix a problem with the environment variables for one package being applied to all packages