Fix bug in tarball upgrade and rollback small change in config.