Revert "Some small environmental changes (step2)"

This reverts commit 11fdf9d331093fdb33e69d51e5a63080ac2b90ec.