Additional filtering of repositories not to uninstall.
Merge in next-stable.