Checking in partial fix for envvar handling