diff --git a/hw/qdev.c b/hw/qdev.c
index 875ca501b6..13c9fe236a 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -296,10 +296,8 @@ void qdev_free(DeviceState *dev)
             bus = QLIST_FIRST(&dev->child_bus);
             qbus_free(bus);
         }
-#if 0 /* FIXME: need sane vmstate_unregister function */
         if (dev->info->vmsd)
             vmstate_unregister(dev->info->vmsd, dev);
-#endif
         if (dev->info->exit)
             dev->info->exit(dev);
         if (dev->opts)