Merge "Fix uninstall for 'all'"