Merge "Don't accidentally delete renamed packages"