Revert "Merge branch 'env-variable-based-scoping'"

This reverts commit d34a244afe3d67bb561e07c967e46b648099a4c6, reversing
changes made to b49c3812d813feee8b80138888bc3c0eef3088a0.
version bumped