Bring back parts of f9e71141 in order to do an autoremove on
minor operations.  We still don't want the cleanup, but at
least since we have migrated to the vital flag we can be
sure that our GUI is not being purged.

(cherry picked from commit 75048a5a)