Reversing env var config enabling logic (but same config)

Reversing env var config enabling logic (but same config) #9809