diff --git a/snuba/datasets/plans/entity_processing.py b/snuba/datasets/plans/entity_processing.py
index 394baf26bd9..7292e5d61f4 100644
--- a/snuba/datasets/plans/entity_processing.py
+++ b/snuba/datasets/plans/entity_processing.py
@@ -97,18 +97,15 @@ def translate_query_and_apply_mappers(
             # translate_query_and_apply_mappers to avoid cache conflicts.
             clickhouse_query = QueryTranslator(mappers).translate(query)
 
-        with sentry_sdk.start_span(
-            op="build_plan.storage_query_plan_builder", description="set_from_clause"
-        ):
-            clickhouse_query.set_from_clause(
-                get_query_data_source(
-                    storage.get_schema().get_data_source(),
-                    allocation_policies=storage.get_allocation_policies(),
-                    final=query.get_final(),
-                    sampling_rate=query.get_sample(),
-                    storage_key=storage.get_storage_key(),
-                )
+        clickhouse_query.set_from_clause(
+            get_query_data_source(
+                storage.get_schema().get_data_source(),
+                allocation_policies=storage.get_allocation_policies(),
+                final=query.get_final(),
+                sampling_rate=query.get_sample(),
+                storage_key=storage.get_storage_key(),
             )
+        )
 
         if settings.get_dry_run():
             explain_meta.add_transform_step(
diff --git a/snuba/datasets/plans/storage_processing.py b/snuba/datasets/plans/storage_processing.py
index 6e6f4352001..3944bb1cee7 100644
--- a/snuba/datasets/plans/storage_processing.py
+++ b/snuba/datasets/plans/storage_processing.py
@@ -131,18 +131,15 @@ def apply_storage_processors(
 
     check_storage_readiness(storage)
 
-    with sentry_sdk.start_span(
-        op="build_plan.storage_query_plan_builder", description="set_from_clause"
-    ):
-        query_plan.query.set_from_clause(
-            get_query_data_source(
-                storage.get_schema().get_data_source(),
-                allocation_policies=storage.get_allocation_policies(),
-                final=query_plan.query.get_from_clause().final,
-                sampling_rate=query_plan.query.get_from_clause().sampling_rate,
-                storage_key=storage.get_storage_key(),
-            )
+    query_plan.query.set_from_clause(
+        get_query_data_source(
+            storage.get_schema().get_data_source(),
+            allocation_policies=storage.get_allocation_policies(),
+            final=query_plan.query.get_from_clause().final,
+            sampling_rate=query_plan.query.get_from_clause().sampling_rate,
+            storage_key=storage.get_storage_key(),
         )
+    )
     assert isinstance(query_plan.query, Query)
     for processor in query_plan.db_query_processors:
         with sentry_sdk.start_span(description=type(processor).__name__, op="processor"):