Fix support for uninstall after PackageInstallation addition