Revert "Removing use of env which only seems to be blowing up"

This reverts commit a3d7ca5e3110278b35b9a2a098b637a1e0826b9d.