Removed the re-evaluation of the options on the environment variables as it's done internally when setting the environment variables