Change soft-fail to use the config, rather than env