Reverted small change in handling of config parameters