Comment the SQL hack
diff --git a/src/trace_processor/perfetto_sql/stdlib/android/battery/charging_states.sql b/src/trace_processor/perfetto_sql/stdlib/android/battery/charging_states.sql
index b9e596e..d1d227d 100644
--- a/src/trace_processor/perfetto_sql/stdlib/android/battery/charging_states.sql
+++ b/src/trace_processor/perfetto_sql/stdlib/android/battery/charging_states.sql
@@ -45,8 +45,8 @@
       -- Note: counter_leading_intervals! partitions on track_id. We alias
       -- machine_id to track_id to partition intervals by machine rather
       -- than by individual track, merging all tracks on the same machine.
-      -- TODO(stevegolton): Fix this when PerfettoSQL supports customizable
-      -- partition columns in counter_leading_intervals!.
+      -- TODO(stevegolton): Fix this when PerfettoSQL Next adds support for
+      -- customizable partition columns in counter_leading_intervals!.
       COALESCE(counter_track.machine_id, 0) AS track_id,
       value
     FROM counter
diff --git a/src/trace_processor/perfetto_sql/stdlib/android/battery/doze.sql b/src/trace_processor/perfetto_sql/stdlib/android/battery/doze.sql
index 9905202..9893949 100644
--- a/src/trace_processor/perfetto_sql/stdlib/android/battery/doze.sql
+++ b/src/trace_processor/perfetto_sql/stdlib/android/battery/doze.sql
@@ -38,8 +38,8 @@
       -- Note: counter_leading_intervals! partitions on track_id. We alias
       -- machine_id to track_id to partition intervals by machine rather
       -- than by individual track, merging all tracks on the same machine.
-      -- TODO(stevegolton): Fix this when PerfettoSQL supports customizable
-      -- partition columns in counter_leading_intervals!.
+      -- TODO(stevegolton): Fix this when PerfettoSQL Next adds support for
+      -- customizable partition columns in counter_leading_intervals!.
       COALESCE(counter_track.machine_id, 0) AS track_id,
       value
     FROM counter
diff --git a/src/trace_processor/perfetto_sql/stdlib/android/screen_state.sql b/src/trace_processor/perfetto_sql/stdlib/android/screen_state.sql
index 5d32b1a..315b534 100644
--- a/src/trace_processor/perfetto_sql/stdlib/android/screen_state.sql
+++ b/src/trace_processor/perfetto_sql/stdlib/android/screen_state.sql
@@ -44,8 +44,8 @@
         -- Note: counter_leading_intervals! partitions on track_id. We alias
         -- machine_id to track_id to partition intervals by machine rather
         -- than by individual track, merging all tracks on the same machine.
-        -- TODO(stevegolton): Fix this when PerfettoSQL supports customizable
-        -- partition columns in counter_leading_intervals!.
+        -- TODO(stevegolton): Fix this when PerfettoSQL Next adds support for
+        -- customizable partition columns in counter_leading_intervals!.
         COALESCE(counter_track.machine_id, 0) AS track_id,
         value
         FROM counter