Remove old check on how setting has been defined it has only been applied to one
var so it's needless mess
Merge pull request #2596 from eileenmcnaughton/CRM-14299

Remove old check on how setting has been defined it has only been applie...