diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java
index c5f6915..84317ea 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java
@@ -168,10 +168,6 @@
             }
         }
 
-        // Flush and wait for it to finish, it is separated from the above wait so they don't deadlock each other.
-        // TODO: Find a better way to do this.
-        flushAndWaitForIO(dsInfo, iInfo);
-
         if (iInfo.isOpen) {
             ILSMOperationTracker indexOpTracker = iInfo.index.getOperationTracker();
             synchronized (indexOpTracker) {