Revert "Enviromental variables"