Merge "Remove support for old envvars"