Remove all references to EnvironmentVariables.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge pull request #6034 from crynobone/patch/remove-env

Remove all references to EnvironmentVariables.