Switched logic for command to use when the config env var is not set
Authored by: hghid 2014-11-18
Parent: [r2479]
Child: [r2481]