diff --git a/crates/store/re_chunk/src/chunk.rs b/crates/store/re_chunk/src/chunk.rs
index 25ace6e31545..0d39331121db 100644
--- a/crates/store/re_chunk/src/chunk.rs
+++ b/crates/store/re_chunk/src/chunk.rs
@@ -67,8 +67,6 @@ impl ChunkComponents {
         component_desc: ComponentDescriptor,
         list_array: Arrow2ListArray<i32>,
     ) -> Option<Arrow2ListArray<i32>> {
-        // TODO(cmc): revert me
-        let component_desc = component_desc.untagged();
         self.0
             .entry(component_desc.component_name)
             .or_default()
diff --git a/docs/snippets/all/descriptors/descr_builtin_archetype.rs b/docs/snippets/all/descriptors/descr_builtin_archetype.rs
index 5562420b50cc..48ddffd25d5a 100644
--- a/docs/snippets/all/descriptors/descr_builtin_archetype.rs
+++ b/docs/snippets/all/descriptors/descr_builtin_archetype.rs
@@ -56,24 +56,6 @@ fn check_tags(rec: &rerun::RecordingStream) {
             .collect::<Vec<_>>();
         descriptors.sort();
 
-        // TODO(cmc): revert me
-        // let expected = vec![
-        //     ComponentDescriptor {
-        //         archetype_name: None,
-        //         archetype_field_name: None,
-        //         component_name: "rerun.components.Points3DIndicator".into(),
-        //     },
-        //     ComponentDescriptor {
-        //         archetype_name: Some("rerun.archetypes.Points3D".into()),
-        //         archetype_field_name: Some("positions".into()),
-        //         component_name: "rerun.components.Position3D".into(),
-        //     },
-        //     ComponentDescriptor {
-        //         archetype_name: Some("rerun.archetypes.Points3D".into()),
-        //         archetype_field_name: Some("radii".into()),
-        //         component_name: "rerun.components.Radius".into(),
-        //     },
-        // ];
         let expected = vec![
             ComponentDescriptor {
                 archetype_name: None,
@@ -81,13 +63,13 @@ fn check_tags(rec: &rerun::RecordingStream) {
                 component_name: "rerun.components.Points3DIndicator".into(),
             },
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
+                archetype_name: Some("rerun.archetypes.Points3D".into()),
+                archetype_field_name: Some("positions".into()),
                 component_name: "rerun.components.Position3D".into(),
             },
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
+                archetype_name: Some("rerun.archetypes.Points3D".into()),
+                archetype_field_name: Some("radii".into()),
                 component_name: "rerun.components.Radius".into(),
             },
         ];
diff --git a/docs/snippets/all/descriptors/descr_custom_archetype.rs b/docs/snippets/all/descriptors/descr_custom_archetype.rs
index f9804b0f1280..83cab7434ce6 100644
--- a/docs/snippets/all/descriptors/descr_custom_archetype.rs
+++ b/docs/snippets/all/descriptors/descr_custom_archetype.rs
@@ -104,38 +104,20 @@ fn check_tags(rec: &rerun::RecordingStream) {
             .collect::<Vec<_>>();
         descriptors.sort();
 
-        // TODO(cmc): revert me
-        // let expected = vec![
-        //     ComponentDescriptor {
-        //         archetype_name: None,
-        //         archetype_field_name: None,
-        //         component_name: "user.CustomPoints3DIndicator".into(),
-        //     },
-        //     ComponentDescriptor {
-        //         archetype_name: Some("user.CustomPoints3D".into()),
-        //         archetype_field_name: Some("colors".into()),
-        //         component_name: "rerun.components.Color".into(),
-        //     },
-        //     ComponentDescriptor {
-        //         archetype_name: Some("user.CustomPoints3D".into()),
-        //         archetype_field_name: Some("custom_positions".into()),
-        //         component_name: "user.CustomPosition3D".into(),
-        //     },
-        // ];
         let expected = vec![
             ComponentDescriptor {
                 archetype_name: None,
                 archetype_field_name: None,
-                component_name: "rerun.components.Color".into(),
+                component_name: "user.CustomPoints3DIndicator".into(),
             },
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
-                component_name: "user.CustomPoints3DIndicator".into(),
+                archetype_name: Some("user.CustomPoints3D".into()),
+                archetype_field_name: Some("colors".into()),
+                component_name: "rerun.components.Color".into(),
             },
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
+                archetype_name: Some("user.CustomPoints3D".into()),
+                archetype_field_name: Some("custom_positions".into()),
                 component_name: "user.CustomPosition3D".into(),
             },
         ];
diff --git a/docs/snippets/all/descriptors/descr_custom_component.rs b/docs/snippets/all/descriptors/descr_custom_component.rs
index 14e3f20505bb..3ad9e97628bd 100644
--- a/docs/snippets/all/descriptors/descr_custom_component.rs
+++ b/docs/snippets/all/descriptors/descr_custom_component.rs
@@ -59,18 +59,10 @@ fn check_tags(rec: &rerun::RecordingStream) {
             .collect::<Vec<_>>();
         descriptors.sort();
 
-        // TODO(cmc): revert me
-        // let expected = vec![
-        //     ComponentDescriptor {
-        //         archetype_name: Some("user.CustomArchetype".into()),
-        //         archetype_field_name: Some("custom_positions".into()),
-        //         component_name: "user.CustomPosition3D".into(),
-        //     }, //
-        // ];
         let expected = vec![
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
+                archetype_name: Some("user.CustomArchetype".into()),
+                archetype_field_name: Some("custom_positions".into()),
                 component_name: "user.CustomPosition3D".into(),
             }, //
         ];
diff --git a/rerun_py/tests/unit/test_dataframe.py b/rerun_py/tests/unit/test_dataframe.py
index a2e3e29ac13e..b4961debe61f 100644
--- a/rerun_py/tests/unit/test_dataframe.py
+++ b/rerun_py/tests/unit/test_dataframe.py
@@ -104,36 +104,14 @@ def test_schema_recording(self) -> None:
         # Color, Points3DIndicator, Position3D, Radius, Text, TextIndicator
         assert len(schema.component_columns()) == 6
 
-        # TODO(cmc): revert me
-        # assert schema.index_columns()[0].name == "log_tick"
-        # assert schema.index_columns()[1].name == "log_time"
-        # assert schema.index_columns()[2].name == "my_index"
-        # assert schema.component_columns()[0].entity_path == "/points"
-        # assert schema.component_columns()[0].component_name == "rerun.components.Points3DIndicator"
-        # assert schema.component_columns()[0].is_static is False
-        # assert schema.component_columns()[1].entity_path == "/points"
-        # assert schema.component_columns()[1].component_name == "rerun.components.Color"
-        # assert schema.component_columns()[1].is_static is False
-        # assert schema.component_columns()[2].entity_path == "/points"
-        # assert schema.component_columns()[2].component_name == "rerun.components.Position3D"
-        # assert schema.component_columns()[2].is_static is False
-        # assert schema.component_columns()[3].entity_path == "/points"
-        # assert schema.component_columns()[3].component_name == "rerun.components.Radius"
-        # assert schema.component_columns()[3].is_static is False
-        # assert schema.component_columns()[4].entity_path == "/static_text"
-        # assert schema.component_columns()[4].component_name == "rerun.components.TextLogIndicator"
-        # assert schema.component_columns()[4].is_static is True
-        # assert schema.component_columns()[5].entity_path == "/static_text"
-        # assert schema.component_columns()[5].component_name == "rerun.components.Text"
-        # assert schema.component_columns()[5].is_static is True
         assert schema.index_columns()[0].name == "log_tick"
         assert schema.index_columns()[1].name == "log_time"
         assert schema.index_columns()[2].name == "my_index"
         assert schema.component_columns()[0].entity_path == "/points"
-        assert schema.component_columns()[0].component_name == "rerun.components.Color"
+        assert schema.component_columns()[0].component_name == "rerun.components.Points3DIndicator"
         assert schema.component_columns()[0].is_static is False
         assert schema.component_columns()[1].entity_path == "/points"
-        assert schema.component_columns()[1].component_name == "rerun.components.Points3DIndicator"
+        assert schema.component_columns()[1].component_name == "rerun.components.Color"
         assert schema.component_columns()[1].is_static is False
         assert schema.component_columns()[2].entity_path == "/points"
         assert schema.component_columns()[2].component_name == "rerun.components.Position3D"
@@ -142,11 +120,14 @@ def test_schema_recording(self) -> None:
         assert schema.component_columns()[3].component_name == "rerun.components.Radius"
         assert schema.component_columns()[3].is_static is False
         assert schema.component_columns()[4].entity_path == "/static_text"
-        assert schema.component_columns()[4].component_name == "rerun.components.Text"
+        assert schema.component_columns()[4].component_name == "rerun.components.TextLogIndicator"
         assert schema.component_columns()[4].is_static is True
         assert schema.component_columns()[5].entity_path == "/static_text"
-        assert schema.component_columns()[5].component_name == "rerun.components.TextLogIndicator"
+        assert schema.component_columns()[5].component_name == "rerun.components.Text"
         assert schema.component_columns()[5].is_static is True
+        assert schema.index_columns()[0].name == "log_tick"
+        assert schema.index_columns()[1].name == "log_time"
+        assert schema.index_columns()[2].name == "my_index"
 
     def test_schema_view(self) -> None:
         schema = self.recording.view(index="my_index", contents="points").schema()