Reversing part of the previous commit that added a bug in env