Switch over to pkgid