Revert change that introduces a new undocumented environment variable