Revert "Next try for envi"

This reverts commit b2b3ac49a6e9b21120e49513f47d3e53cc794402.