Revert "Remove obsolete environment variables"

This reverts commit ac8080b83c8bcaaadd35f7430ccc0add0eade15a.
Remove bogus comment