Revert "clean out env stuff"

This reverts commit 740c7e68bb3f528acddba93c3a416d1b4c46f780.