Merge "Revert "Removing historical tasks when packages are uninstalled.""