Rollback of config.go from previous 0.6.2