Revert "SECURITY FIX: Fix package uids being reused between uninstall and rei…"

This reverts commit b483e2adbd95de14315c673f86802deb6864bcc3.