diff --git a/compiler-rt/lib/scudo/standalone/local_cache.h b/compiler-rt/lib/scudo/standalone/local_cache.h
--- a/compiler-rt/lib/scudo/standalone/local_cache.h
+++ b/compiler-rt/lib/scudo/standalone/local_cache.h
@@ -67,17 +67,6 @@
       S->unlink(&Stats);
   }
 
-  void* allocateTransferBatch() {
-    PerClass *C = &PerClassArray[BatchClassId];
-    if (C->Count == 0) {
-      if (UNLIKELY(!refill(C, BatchClassId)))
-        return nullptr;
-      DCHECK_GT(C->Count, 0);
-    }
-    CompactPtrT CompactP = C->Chunks[--C->Count];
-    return Allocator->decompactPtr(BatchClassId, CompactP);
-  }
-
   void *allocate(uptr ClassId) {
     DCHECK_LT(ClassId, NumClasses);
     PerClass *C = &PerClassArray[ClassId];
@@ -96,14 +85,6 @@
     return Allocator->decompactPtr(ClassId, CompactP);
   }
 
-  void deallocateBatch(void *P) {
-    PerClass *C = &PerClassArray[BatchClassId];
-    if (C->Count == C->MaxCount)
-      drain(C, BatchClassId);
-    C->Chunks[C->Count++] =
-        Allocator->compactPtr(BatchClassId, reinterpret_cast<uptr>(P));
-  }
-
   void deallocate(uptr ClassId, void *P) {
     CHECK_LT(ClassId, NumClasses);
     PerClass *C = &PerClassArray[ClassId];
@@ -141,8 +122,16 @@
   }
 
   TransferBatch *createBatch(uptr ClassId, void *B) {
-    if (ClassId != BatchClassId)
-      B = allocateTransferBatch();
+    if (ClassId != BatchClassId) {
+      B = allocate(BatchClassId);
+      const uptr BatchSize = SizeClassAllocator::getSizeByClassId(BatchClassId);
+      // We don't want to track allocated/free'd stats of transfer batches.
+      // Specializing or branching in allocate() based on `ClassId !=
+      // BatchClassId` ends up trashing the icache for a very hot function, and
+      // so we just undo the changes to the stats back here in the slow path.
+      Stats.sub(StatAllocated, BatchSize);
+      Stats.add(StatFree, BatchSize);
+    }
     return reinterpret_cast<TransferBatch *>(B);
   }
 
@@ -178,8 +167,16 @@
   }
 
   void destroyBatch(uptr ClassId, void *B) {
-    if (ClassId != BatchClassId)
-      deallocateBatch(B);
+    if (ClassId != BatchClassId) {
+      deallocate(BatchClassId, B);
+      const uptr BatchSize = SizeClassAllocator::getSizeByClassId(BatchClassId);
+      // We don't want to track allocated/free'd stats of transfer batches.
+      // Specializing or branching in deallocate() based on `ClassId !=
+      // BatchClassId` ends up trashing the icache for a very hot function, and
+      // so we just undo the changes to the stats back here in the slow path.
+      Stats.add(StatAllocated, BatchSize);
+      Stats.sub(StatFree, BatchSize);
+    }
   }
 
   NOINLINE bool refill(PerClass *C, uptr ClassId) {