diff --git a/[refs] b/[refs]
index 123d2ea9b5cb..e41ae839c343 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7542a6b0d273ba4338028d39bc0e6e8cbfc68898
+refs/heads/master: a18cc421649dfdc21edb6c4c867dd05447d7df8c
diff --git a/trunk/drivers/vhost/scsi.c b/trunk/drivers/vhost/scsi.c
index 5179f7aa1b0b..701420297225 100644
--- a/trunk/drivers/vhost/scsi.c
+++ b/trunk/drivers/vhost/scsi.c
@@ -162,14 +162,8 @@ enum {
 	VHOST_SCSI_VQ_IO = 2,
 };
 
-/*
- * VIRTIO_RING_F_EVENT_IDX seems broken. Not sure the bug is in
- * kernel but disabling it helps.
- * TODO: debug and remove the workaround.
- */
 enum {
-	VHOST_SCSI_FEATURES = (VHOST_FEATURES & (~VIRTIO_RING_F_EVENT_IDX)) |
-			      (1ULL << VIRTIO_SCSI_F_HOTPLUG)
+	VHOST_SCSI_FEATURES = VHOST_FEATURES | (1ULL << VIRTIO_SCSI_F_HOTPLUG)
 };
 
 #define VHOST_SCSI_MAX_TARGET	256