Use backup pollser instead of connectivity watcher
diff --git a/config.m4 b/config.m4
index ca374ce..70abfaf 100644
--- a/config.m4
+++ b/config.m4
@@ -278,12 +278,11 @@
     src/core/tsi/transport_security_adapter.cc \
     src/core/ext/transport/chttp2/server/chttp2_server.cc \
     src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
+    src/core/ext/filters/client_channel/backup_poller.cc \
     src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/channel_connectivity_internal.cc \
     src/core/ext/filters/client_channel/client_channel.cc \
     src/core/ext/filters/client_channel/client_channel_factory.cc \
     src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connectivity_watcher.cc \
     src/core/ext/filters/client_channel/connector.cc \
     src/core/ext/filters/client_channel/http_connect_handshaker.cc \
     src/core/ext/filters/client_channel/http_proxy.cc \