diff --git a/.changelog/17317.txt b/.changelog/17317.txt
deleted file mode 100644
index 76c86a0a28e..00000000000
--- a/.changelog/17317.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-connect: fix a bug with Envoy potentially starting with incomplete configuration by not waiting enough for initial xDS configuration.
-```
diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go
index 2a2d918d916..9e264fe9351 100644
--- a/command/connect/envoy/bootstrap_tpl.go
+++ b/command/connect/envoy/bootstrap_tpl.go
@@ -278,12 +278,10 @@ const bootstrapTemplate = `{
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden
index c8144ac72fa..a8ba4704f5e 100644
--- a/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden
+++ b/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden
@@ -197,12 +197,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden
index a89575d2c16..5485256b4f9 100644
--- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden
+++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden
index 184a290b245..18a28a491e8 100644
--- a/command/connect/envoy/testdata/access-log-path.golden
+++ b/command/connect/envoy/testdata/access-log-path.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/access-logs-enabled-custom.golden b/command/connect/envoy/testdata/access-logs-enabled-custom.golden
index 50531f89c25..6af720bdacc 100644
--- a/command/connect/envoy/testdata/access-logs-enabled-custom.golden
+++ b/command/connect/envoy/testdata/access-logs-enabled-custom.golden
@@ -197,12 +197,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/access-logs-enabled.golden b/command/connect/envoy/testdata/access-logs-enabled.golden
index ea2e1506071..892cf46324b 100644
--- a/command/connect/envoy/testdata/access-logs-enabled.golden
+++ b/command/connect/envoy/testdata/access-logs-enabled.golden
@@ -219,12 +219,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/acl-enabled-and-token.golden b/command/connect/envoy/testdata/acl-enabled-and-token.golden
index a5427c7f245..3342f039047 100644
--- a/command/connect/envoy/testdata/acl-enabled-and-token.golden
+++ b/command/connect/envoy/testdata/acl-enabled-and-token.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/acl-enabled-but-no-token.golden b/command/connect/envoy/testdata/acl-enabled-but-no-token.golden
index a89575d2c16..5485256b4f9 100644
--- a/command/connect/envoy/testdata/acl-enabled-but-no-token.golden
+++ b/command/connect/envoy/testdata/acl-enabled-but-no-token.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden
index c8144ac72fa..a8ba4704f5e 100644
--- a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden
+++ b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden
@@ -197,12 +197,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden
index a89575d2c16..5485256b4f9 100644
--- a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden
+++ b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/defaults-nodemeta.golden b/command/connect/envoy/testdata/defaults-nodemeta.golden
index ea65421109f..41788c3c42e 100644
--- a/command/connect/envoy/testdata/defaults-nodemeta.golden
+++ b/command/connect/envoy/testdata/defaults-nodemeta.golden
@@ -185,12 +185,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden
index a89575d2c16..5485256b4f9 100644
--- a/command/connect/envoy/testdata/defaults.golden
+++ b/command/connect/envoy/testdata/defaults.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden
index e604c61d506..ab87aa9b438 100644
--- a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden
+++ b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/envoy-readiness-probe.golden b/command/connect/envoy/testdata/envoy-readiness-probe.golden
index 18680a3206b..444528e8808 100644
--- a/command/connect/envoy/testdata/envoy-readiness-probe.golden
+++ b/command/connect/envoy/testdata/envoy-readiness-probe.golden
@@ -273,12 +273,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden
index c8144ac72fa..a8ba4704f5e 100644
--- a/command/connect/envoy/testdata/existing-ca-file.golden
+++ b/command/connect/envoy/testdata/existing-ca-file.golden
@@ -197,12 +197,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden
index c0566ab351d..e246dbb324e 100644
--- a/command/connect/envoy/testdata/existing-ca-path.golden
+++ b/command/connect/envoy/testdata/existing-ca-path.golden
@@ -197,12 +197,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden
index 819994f0c0f..038e65d8d9f 100644
--- a/command/connect/envoy/testdata/extra_-multiple.golden
+++ b/command/connect/envoy/testdata/extra_-multiple.golden
@@ -206,12 +206,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden
index b1fb71997b3..14b8f082050 100644
--- a/command/connect/envoy/testdata/extra_-single.golden
+++ b/command/connect/envoy/testdata/extra_-single.golden
@@ -197,12 +197,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden
index e604c61d506..ab87aa9b438 100644
--- a/command/connect/envoy/testdata/grpc-addr-env.golden
+++ b/command/connect/envoy/testdata/grpc-addr-env.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden
index e604c61d506..ab87aa9b438 100644
--- a/command/connect/envoy/testdata/grpc-addr-flag.golden
+++ b/command/connect/envoy/testdata/grpc-addr-flag.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden b/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden
index 2b902d48d47..89764c310a4 100644
--- a/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden
+++ b/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden
@@ -196,12 +196,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden
index 88e6e46bfb9..eb8841ae993 100644
--- a/command/connect/envoy/testdata/grpc-addr-unix.golden
+++ b/command/connect/envoy/testdata/grpc-addr-unix.golden
@@ -183,12 +183,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/grpc-tls-addr-config.golden b/command/connect/envoy/testdata/grpc-tls-addr-config.golden
index e65fc5f09cd..e79cf0455d2 100644
--- a/command/connect/envoy/testdata/grpc-tls-addr-config.golden
+++ b/command/connect/envoy/testdata/grpc-tls-addr-config.golden
@@ -197,12 +197,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden
index 038c8fcc5dd..cc2e504eaf9 100644
--- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden
+++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden
@@ -273,12 +273,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
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 80f1f9a8b7c..cddaa490dd2 100644
--- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
+++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
@@ -273,12 +273,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden
index 8a2d5f62768..d79739ed728 100644
--- a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden
+++ b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden
@@ -274,12 +274,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
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 6192f674ac1..3149fc4b33a 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
@@ -273,12 +273,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
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 92d80e033e9..f8eb4475411 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
@@ -273,12 +273,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden
index 40a5c74d1bc..c4fba520ed9 100644
--- a/command/connect/envoy/testdata/ingress-gateway.golden
+++ b/command/connect/envoy/testdata/ingress-gateway.golden
@@ -273,12 +273,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
index c93286e64e8..71b82250e30 100644
--- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
+++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
@@ -310,12 +310,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
index 272175f7073..07e56ae878a 100644
--- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
+++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
@@ -310,12 +310,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/prometheus-metrics.golden b/command/connect/envoy/testdata/prometheus-metrics.golden
index 5806dd671f7..5adc8a9485e 100644
--- a/command/connect/envoy/testdata/prometheus-metrics.golden
+++ b/command/connect/envoy/testdata/prometheus-metrics.golden
@@ -273,12 +273,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden
index dd4ff53dd19..d2a2371f20e 100644
--- a/command/connect/envoy/testdata/stats-config-override.golden
+++ b/command/connect/envoy/testdata/stats-config-override.golden
@@ -62,12 +62,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/telemetry-collector.golden b/command/connect/envoy/testdata/telemetry-collector.golden
index 983e51633bc..7c584864a0b 100644
--- a/command/connect/envoy/testdata/telemetry-collector.golden
+++ b/command/connect/envoy/testdata/telemetry-collector.golden
@@ -221,12 +221,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden
index 816bf748757..ac057e9a60b 100644
--- a/command/connect/envoy/testdata/token-arg.golden
+++ b/command/connect/envoy/testdata/token-arg.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden
index 816bf748757..ac057e9a60b 100644
--- a/command/connect/envoy/testdata/token-env.golden
+++ b/command/connect/envoy/testdata/token-env.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden
index 816bf748757..ac057e9a60b 100644
--- a/command/connect/envoy/testdata/token-file-arg.golden
+++ b/command/connect/envoy/testdata/token-file-arg.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden
index 816bf748757..ac057e9a60b 100644
--- a/command/connect/envoy/testdata/token-file-env.golden
+++ b/command/connect/envoy/testdata/token-file-env.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/xds-addr-config.golden b/command/connect/envoy/testdata/xds-addr-config.golden
index e604c61d506..ab87aa9b438 100644
--- a/command/connect/envoy/testdata/xds-addr-config.golden
+++ b/command/connect/envoy/testdata/xds-addr-config.golden
@@ -184,12 +184,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {
diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden
index dc4779a7753..fd52f5ae3f5 100644
--- a/command/connect/envoy/testdata/zipkin-tracing-config.golden
+++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden
@@ -217,12 +217,10 @@
   "dynamic_resources": {
     "lds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "cds_config": {
       "ads": {},
-      "initial_fetch_timeout": "0s",
       "resource_api_version": "V3"
     },
     "ads_config": {