Revert "remove unused environment variables"

This reverts commit f90b0c13f20b08d124d51b9900249212b38931bf.