Merge "Use a (somewhat) more documented environment variable."