diff --git a/src/util/virpci.c b/src/util/virpci.c
index 4c7c26f981..9c9ffa55c2 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -54,7 +54,6 @@ VIR_ENUM_IMPL(virPCIStubDriver,
               VIR_PCI_STUB_DRIVER_LAST,
               "none",
               "pciback", /* XEN */
-              "pci-stub", /* KVM */
               "vfio-pci", /* VFIO */
 );
 
@@ -1541,16 +1540,6 @@ virPCIDeviceReattach(virPCIDevicePtr dev,
         return -1;
     }
 
-    /* Wait for device cleanup if it is qemu/kvm */
-    if (virPCIDeviceGetStubDriver(dev) == VIR_PCI_STUB_DRIVER_KVM) {
-        int retries = 100;
-        while (virPCIDeviceWaitForCleanup(dev, "kvm_assigned_device")
-               && retries) {
-            usleep(100*1000);
-            retries--;
-        }
-    }
-
     if (virPCIDeviceUnbindFromStub(dev) < 0)
         return -1;
 
diff --git a/src/util/virpci.h b/src/util/virpci.h
index 5074851777..4ac0d230a4 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -59,7 +59,6 @@ struct _virPCIDeviceAddress {
 typedef enum {
     VIR_PCI_STUB_DRIVER_NONE = 0,
     VIR_PCI_STUB_DRIVER_XEN,
-    VIR_PCI_STUB_DRIVER_KVM,
     VIR_PCI_STUB_DRIVER_VFIO,
     VIR_PCI_STUB_DRIVER_LAST
 } virPCIStubDriver;