diff --git a/eden/mononoke/cmds/blobstore_healer/wal_healer.rs b/eden/mononoke/cmds/blobstore_healer/wal_healer.rs
index 3b4b3cc8d4a4b..107b6a0f811eb 100644
--- a/eden/mononoke/cmds/blobstore_healer/wal_healer.rs
+++ b/eden/mononoke/cmds/blobstore_healer/wal_healer.rs
@@ -187,7 +187,7 @@ impl WalHealer {
         let healing_futures: Vec<(_, u64)> = queue_entries
             .into_iter()
             .sorted_by_key(|entry| entry.blobstore_key.clone())
-            .group_by(|entry| entry.blobstore_key.clone())
+            .chunk_by(|entry| entry.blobstore_key.clone())
             .into_iter()
             .map(|(key, entries)| {
                 let entries: Vec<_> = entries.into_iter().collect();
diff --git a/eden/mononoke/features/history_traversal/src/log.rs b/eden/mononoke/features/history_traversal/src/log.rs
index ef8f51bf094c3..1a1f2144b9463 100644
--- a/eden/mononoke/features/history_traversal/src/log.rs
+++ b/eden/mononoke/features/history_traversal/src/log.rs
@@ -503,7 +503,7 @@ async fn process_deletion_nodes(
     deleted_to_last_mapping.sort_by_key(|(deleted_linknode, _)| *deleted_linknode);
     deleted_to_last_mapping
         .into_iter()
-        .group_by(|(deleted_linknode, _)| **deleted_linknode)
+        .chunk_by(|(deleted_linknode, _)| **deleted_linknode)
         .into_iter()
         .for_each(|(deleted_linknode, grouped_last)| {
             history_graph.insert(
@@ -789,7 +789,7 @@ async fn augment_history_graph_insertions_with_mutable_ancestry(
     graph_insertions.sort_unstable_by_key(|((_, path), _)| path.clone());
     let graph_insertions_by_path = graph_insertions
         .into_iter()
-        .group_by(|((_, path), _)| path.clone());
+        .chunk_by(|((_, path), _)| path.clone());
     let graph_insertions_by_path = graph_insertions_by_path
         .into_iter()
         .map(|(k, v)| (k, v.collect::<Vec<_>>()))
diff --git a/eden/mononoke/newfilenodes/src/reader.rs b/eden/mononoke/newfilenodes/src/reader.rs
index 3bfd2aa3f97c4..dde32db6c0ae8 100644
--- a/eden/mononoke/newfilenodes/src/reader.rs
+++ b/eden/mononoke/newfilenodes/src/reader.rs
@@ -615,7 +615,7 @@ async fn select_paths<I: Iterator<Item = PathHashBytes>>(
     recorder: &PerfCounterRecorder<'_>,
 ) -> Result<HashMap<PathHashBytes, PathBytes>, ErrorKind> {
     let futs = iter
-        .group_by(|path_hash| connections.shard_id(path_hash))
+        .chunk_by(|path_hash| connections.shard_id(path_hash))
         .into_iter()
         .map(|(shard_id, group)| {
             let group = group.collect::<Vec<_>>();
diff --git a/eden/mononoke/walker/src/detail/state.rs b/eden/mononoke/walker/src/detail/state.rs
index c7cb08821925f..78c6d71a86d4a 100644
--- a/eden/mononoke/walker/src/detail/state.rs
+++ b/eden/mononoke/walker/src/detail/state.rs
@@ -863,7 +863,7 @@ impl TailingWalkVisitor for WalkState {
                 .deferred_bcs
                 .iter()
                 .flat_map(|e| e.value().clone())
-                .group_by(|e| e.label)
+                .chunk_by(|e| e.label)
                 .into_iter()
                 .map(|(key, group)| (key, group.count()))
                 .collect();
diff --git a/eden/mononoke/walker/src/detail/validate.rs b/eden/mononoke/walker/src/detail/validate.rs
index b1b4aa2f3363b..800c568ebd658 100644
--- a/eden/mononoke/walker/src/detail/validate.rs
+++ b/eden/mononoke/walker/src/detail/validate.rs
@@ -218,7 +218,7 @@ impl ValidatingVisitor {
             ),
             checks_by_node_type: include_checks
                 .into_iter()
-                .group_by(|c| c.node_type())
+                .chunk_by(|c| c.node_type())
                 .into_iter()
                 .map(|(key, group)| (key, HashSet::from_iter(group)))
                 .collect(),