Fixes #6960: Environments no longer disappear on environment selector.

Do we need to keep this?