diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go
index 3f65146831fc..bbd87a23cc93 100644
--- a/command/connect/envoy/bootstrap_tpl.go
+++ b/command/connect/envoy/bootstrap_tpl.go
@@ -188,7 +188,6 @@ const bootstrapTemplate = `{
     "cds_config": { "ads": {} },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden
index 0c8cf00725a4..27ebc5f4543c 100644
--- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden
+++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden
@@ -97,7 +97,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden
index 5a2fa3c0f828..e20699eb8f64 100644
--- a/command/connect/envoy/testdata/access-log-path.golden
+++ b/command/connect/envoy/testdata/access-log-path.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden
index e13e4a108991..3866bbd8bc8e 100644
--- a/command/connect/envoy/testdata/defaults.golden
+++ b/command/connect/envoy/testdata/defaults.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden
index 17b99b3756cb..f1fce5d7d6c8 100644
--- a/command/connect/envoy/testdata/existing-ca-file.golden
+++ b/command/connect/envoy/testdata/existing-ca-file.golden
@@ -97,7 +97,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden
index 40fb5d6163c9..b8cf3c48550a 100644
--- a/command/connect/envoy/testdata/extra_-multiple.golden
+++ b/command/connect/envoy/testdata/extra_-multiple.golden
@@ -110,7 +110,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden
index a0be6b091ccc..90e29172cd2d 100644
--- a/command/connect/envoy/testdata/extra_-single.golden
+++ b/command/connect/envoy/testdata/extra_-single.golden
@@ -101,7 +101,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden
index f8e925c1f6c7..5e36f1b92d1b 100644
--- a/command/connect/envoy/testdata/grpc-addr-config.golden
+++ b/command/connect/envoy/testdata/grpc-addr-config.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden
index f8e925c1f6c7..5e36f1b92d1b 100644
--- a/command/connect/envoy/testdata/grpc-addr-env.golden
+++ b/command/connect/envoy/testdata/grpc-addr-env.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden
index f8e925c1f6c7..5e36f1b92d1b 100644
--- a/command/connect/envoy/testdata/grpc-addr-flag.golden
+++ b/command/connect/envoy/testdata/grpc-addr-flag.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden
index c8bb597da3d0..86b147acac3a 100644
--- a/command/connect/envoy/testdata/grpc-addr-unix.golden
+++ b/command/connect/envoy/testdata/grpc-addr-unix.golden
@@ -87,7 +87,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden
index f84695216acf..b020b9e59347 100644
--- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden
+++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden
@@ -161,7 +161,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
index 65735e6eef5f..84744703ffe5 100644
--- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
+++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
@@ -161,7 +161,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
index 3e4e03a746c5..5bd97f0bbc38 100644
--- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
+++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
@@ -161,7 +161,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
index 294d3883aa8f..098363d089fb 100644
--- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
+++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
@@ -161,7 +161,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden
index 7bf22d21aa8b..962dcefe123d 100644
--- a/command/connect/envoy/testdata/ingress-gateway.golden
+++ b/command/connect/envoy/testdata/ingress-gateway.golden
@@ -161,7 +161,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden
index a4f0730ce9f6..4453d13b82a1 100644
--- a/command/connect/envoy/testdata/stats-config-override.golden
+++ b/command/connect/envoy/testdata/stats-config-override.golden
@@ -46,7 +46,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden
index 74b929658558..5e0bf0f893b7 100644
--- a/command/connect/envoy/testdata/token-arg.golden
+++ b/command/connect/envoy/testdata/token-arg.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden
index 74b929658558..5e0bf0f893b7 100644
--- a/command/connect/envoy/testdata/token-env.golden
+++ b/command/connect/envoy/testdata/token-env.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden
index 74b929658558..5e0bf0f893b7 100644
--- a/command/connect/envoy/testdata/token-file-arg.golden
+++ b/command/connect/envoy/testdata/token-file-arg.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden
index 74b929658558..5e0bf0f893b7 100644
--- a/command/connect/envoy/testdata/token-file-env.golden
+++ b/command/connect/envoy/testdata/token-file-env.golden
@@ -88,7 +88,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {
diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden
index a43d4f1251aa..1db13556b171 100644
--- a/command/connect/envoy/testdata/zipkin-tracing-config.golden
+++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden
@@ -121,7 +121,6 @@
     },
     "ads_config": {
       "api_type": "GRPC",
-      "set_node_on_first_message_only": true,
       "grpc_services": {
         "initial_metadata": [
           {