Revert "Fix environment variables"

This reverts commit 7ddcbcff8210a2b4e3cf9481dc613a8665a242ce.
Use original environment variables