Reverted use of env variables in other env variables