One TODO introduced - temporary workaround to prevent autohealing after a regular uninstall