Revert "ENV improvements."

This reverts commit ddf6a677a11c53ad2a6ad102bb0e044e97b28da9.