diff --git a/CMakeLists.txt b/CMakeLists.txt
index 123f0048645..95a26f71fc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1833,7 +1833,6 @@ add_library(grpc
   src/core/client_channel/subchannel_stream_client.cc
   src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   src/core/ext/filters/census/grpc_context.cc
-  src/core/ext/filters/channel_idle/channel_idle_filter.cc
   src/core/ext/filters/channel_idle/idle_filter_state.cc
   src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
   src/core/ext/filters/deadline/deadline_filter.cc
@@ -2929,7 +2928,6 @@ add_library(grpc_unsecure
   src/core/client_channel/subchannel_stream_client.cc
   src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   src/core/ext/filters/census/grpc_context.cc
-  src/core/ext/filters/channel_idle/channel_idle_filter.cc
   src/core/ext/filters/channel_idle/idle_filter_state.cc
   src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
   src/core/ext/filters/deadline/deadline_filter.cc
diff --git a/Makefile b/Makefile
index 1764d8939e9..d9fe0b00c6e 100644
--- a/Makefile
+++ b/Makefile
@@ -686,7 +686,6 @@ LIBGRPC_SRC = \
     src/core/client_channel/subchannel_stream_client.cc \
     src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
     src/core/ext/filters/census/grpc_context.cc \
-    src/core/ext/filters/channel_idle/channel_idle_filter.cc \
     src/core/ext/filters/channel_idle/idle_filter_state.cc \
     src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
     src/core/ext/filters/deadline/deadline_filter.cc \
diff --git a/Package.swift b/Package.swift
index 87cb3261dd2..b0ab8bee111 100644
--- a/Package.swift
+++ b/Package.swift
@@ -157,8 +157,6 @@ let package = Package(
         "src/core/ext/filters/backend_metrics/backend_metric_filter.h",
         "src/core/ext/filters/backend_metrics/backend_metric_provider.h",
         "src/core/ext/filters/census/grpc_context.cc",
-        "src/core/ext/filters/channel_idle/channel_idle_filter.cc",
-        "src/core/ext/filters/channel_idle/channel_idle_filter.h",
         "src/core/ext/filters/channel_idle/idle_filter_state.cc",
         "src/core/ext/filters/channel_idle/idle_filter_state.h",
         "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 2fcd18e4eed..130752f1638 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -240,7 +240,6 @@ libs:
   - src/core/client_channel/subchannel_stream_client.h
   - src/core/ext/filters/backend_metrics/backend_metric_filter.h
   - src/core/ext/filters/backend_metrics/backend_metric_provider.h
-  - src/core/ext/filters/channel_idle/channel_idle_filter.h
   - src/core/ext/filters/channel_idle/idle_filter_state.h
   - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
   - src/core/ext/filters/deadline/deadline_filter.h
@@ -1263,7 +1262,6 @@ libs:
   - src/core/client_channel/subchannel_stream_client.cc
   - src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   - src/core/ext/filters/census/grpc_context.cc
-  - src/core/ext/filters/channel_idle/channel_idle_filter.cc
   - src/core/ext/filters/channel_idle/idle_filter_state.cc
   - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
   - src/core/ext/filters/deadline/deadline_filter.cc
@@ -2228,7 +2226,6 @@ libs:
   - src/core/client_channel/subchannel_stream_client.h
   - src/core/ext/filters/backend_metrics/backend_metric_filter.h
   - src/core/ext/filters/backend_metrics/backend_metric_provider.h
-  - src/core/ext/filters/channel_idle/channel_idle_filter.h
   - src/core/ext/filters/channel_idle/idle_filter_state.h
   - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
   - src/core/ext/filters/deadline/deadline_filter.h
@@ -2720,7 +2717,6 @@ libs:
   - src/core/client_channel/subchannel_stream_client.cc
   - src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   - src/core/ext/filters/census/grpc_context.cc
-  - src/core/ext/filters/channel_idle/channel_idle_filter.cc
   - src/core/ext/filters/channel_idle/idle_filter_state.cc
   - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
   - src/core/ext/filters/deadline/deadline_filter.cc
diff --git a/config.m4 b/config.m4
index 7d57c1c79b2..a99a765637c 100644
--- a/config.m4
+++ b/config.m4
@@ -61,7 +61,6 @@ if test "$PHP_GRPC" != "no"; then
     src/core/client_channel/subchannel_stream_client.cc \
     src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
     src/core/ext/filters/census/grpc_context.cc \
-    src/core/ext/filters/channel_idle/channel_idle_filter.cc \
     src/core/ext/filters/channel_idle/idle_filter_state.cc \
     src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
     src/core/ext/filters/deadline/deadline_filter.cc \
diff --git a/config.w32 b/config.w32
index dfad8c4270e..f2df20bdf9f 100644
--- a/config.w32
+++ b/config.w32
@@ -26,7 +26,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\client_channel\\subchannel_stream_client.cc " +
     "src\\core\\ext\\filters\\backend_metrics\\backend_metric_filter.cc " +
     "src\\core\\ext\\filters\\census\\grpc_context.cc " +
-    "src\\core\\ext\\filters\\channel_idle\\channel_idle_filter.cc " +
     "src\\core\\ext\\filters\\channel_idle\\idle_filter_state.cc " +
     "src\\core\\ext\\filters\\channel_idle\\legacy_channel_idle_filter.cc " +
     "src\\core\\ext\\filters\\deadline\\deadline_filter.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 72e1dd73382..4b51f0c3ffa 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -282,7 +282,6 @@ Pod::Spec.new do |s|
                       'src/core/client_channel/subchannel_stream_client.h',
                       'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
                       'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
-                      'src/core/ext/filters/channel_idle/channel_idle_filter.h',
                       'src/core/ext/filters/channel_idle/idle_filter_state.h',
                       'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
                       'src/core/ext/filters/deadline/deadline_filter.h',
@@ -1571,7 +1570,6 @@ Pod::Spec.new do |s|
                               'src/core/client_channel/subchannel_stream_client.h',
                               'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
                               'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
-                              'src/core/ext/filters/channel_idle/channel_idle_filter.h',
                               'src/core/ext/filters/channel_idle/idle_filter_state.h',
                               'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
                               'src/core/ext/filters/deadline/deadline_filter.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 551cd0a3d5d..df64c115264 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -273,8 +273,6 @@ Pod::Spec.new do |s|
                       'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
                       'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
                       'src/core/ext/filters/census/grpc_context.cc',
-                      'src/core/ext/filters/channel_idle/channel_idle_filter.cc',
-                      'src/core/ext/filters/channel_idle/channel_idle_filter.h',
                       'src/core/ext/filters/channel_idle/idle_filter_state.cc',
                       'src/core/ext/filters/channel_idle/idle_filter_state.h',
                       'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
@@ -2373,7 +2371,6 @@ Pod::Spec.new do |s|
                               'src/core/client_channel/subchannel_stream_client.h',
                               'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
                               'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
-                              'src/core/ext/filters/channel_idle/channel_idle_filter.h',
                               'src/core/ext/filters/channel_idle/idle_filter_state.h',
                               'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
                               'src/core/ext/filters/deadline/deadline_filter.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 43722366430..158e4277f82 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -163,8 +163,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_filter.h )
   s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_provider.h )
   s.files += %w( src/core/ext/filters/census/grpc_context.cc )
-  s.files += %w( src/core/ext/filters/channel_idle/channel_idle_filter.cc )
-  s.files += %w( src/core/ext/filters/channel_idle/channel_idle_filter.h )
   s.files += %w( src/core/ext/filters/channel_idle/idle_filter_state.cc )
   s.files += %w( src/core/ext/filters/channel_idle/idle_filter_state.h )
   s.files += %w( src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc )
diff --git a/package.xml b/package.xml
index 6fa34c7119a..eeaa57e1ff4 100644
--- a/package.xml
+++ b/package.xml
@@ -145,8 +145,6 @@
     <file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_filter.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_provider.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/census/grpc_context.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/channel_idle_filter.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/channel_idle_filter.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/idle_filter_state.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/idle_filter_state.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc" role="src" />
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 3bd8cbd3b25..540ba147a25 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -35,7 +35,6 @@ CORE_SOURCE_FILES = [
     'src/core/client_channel/subchannel_stream_client.cc',
     'src/core/ext/filters/backend_metrics/backend_metric_filter.cc',
     'src/core/ext/filters/census/grpc_context.cc',
-    'src/core/ext/filters/channel_idle/channel_idle_filter.cc',
     'src/core/ext/filters/channel_idle/idle_filter_state.cc',
     'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
     'src/core/ext/filters/deadline/deadline_filter.cc',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index fbdabd35e74..5a2eb6013b1 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1123,8 +1123,6 @@ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
 src/core/ext/filters/backend_metrics/backend_metric_filter.h \
 src/core/ext/filters/backend_metrics/backend_metric_provider.h \
 src/core/ext/filters/census/grpc_context.cc \
-src/core/ext/filters/channel_idle/channel_idle_filter.cc \
-src/core/ext/filters/channel_idle/channel_idle_filter.h \
 src/core/ext/filters/channel_idle/idle_filter_state.cc \
 src/core/ext/filters/channel_idle/idle_filter_state.h \
 src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 0ad29a2f943..8c3baace34d 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -928,8 +928,6 @@ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
 src/core/ext/filters/backend_metrics/backend_metric_filter.h \
 src/core/ext/filters/backend_metrics/backend_metric_provider.h \
 src/core/ext/filters/census/grpc_context.cc \
-src/core/ext/filters/channel_idle/channel_idle_filter.cc \
-src/core/ext/filters/channel_idle/channel_idle_filter.h \
 src/core/ext/filters/channel_idle/idle_filter_state.cc \
 src/core/ext/filters/channel_idle/idle_filter_state.h \
 src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \