Another attempt to correctly set the ENV vars.