Merge "Revert "Make libvirt safe again""