diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index a34a441ae8b..049391e48de 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -555,7 +555,6 @@ public class IndexShard extends AbstractIndexShardComponent {
                 refreshMetric.inc(System.nanoTime() - time);
             } finally {
                 logger.debug("remove [{}] writing bytes for shard [{}]", new ByteSizeValue(bytes), shardId());
-                // nocommit but we don't promptly stop index throttling anymore?
                 writingBytes.addAndGet(-bytes);
             }
         } else {
@@ -1280,7 +1279,6 @@ public class IndexShard extends AbstractIndexShardComponent {
             try {
                 engine.writeIndexingBuffer();
             } finally {
-                // nocommit but we don't promptly stop index throttling anymore?
                 writingBytes.addAndGet(-bytes);
                 logger.debug("remove [{}] writing bytes for shard [{}]", new ByteSizeValue(bytes), shardId());
             }
diff --git a/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java b/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
index 64259c7be97..3fcf2467ca8 100644
--- a/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
@@ -330,7 +330,14 @@ public class IndexingMemoryControllerTests extends ESSingleNodeTestCase {
             @Override
             protected long getIndexBufferRAMBytesUsed(IndexShard shard) {
                 return shard.getIndexBufferRAMBytesUsed();
+            }   
+
+            @Override
+            protected void writeIndexingBufferAsync(IndexShard shard) {
+                // just do it sync'd for this test
+                shard.writeIndexingBuffer();
             }
+
         };
 
         for (int i = 0; i < 100; i++) {