Remove config var refactoring

Not quite right.  This puts back the original variable resolution
functionality.