Add preliminary support for uninstalling