diff --git a/templates/server-headless-service.yaml b/templates/server-headless-service.yaml
index 4bb276b..a37c639 100644
--- a/templates/server-headless-service.yaml
+++ b/templates/server-headless-service.yaml
@@ -13,7 +13,6 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 {{ template "vault.service.annotations" .}}
 spec:
   clusterIP: None
diff --git a/templates/server-service.yaml b/templates/server-service.yaml
index 6d50584..6f82e38 100644
--- a/templates/server-service.yaml
+++ b/templates/server-service.yaml
@@ -13,10 +13,6 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    # This must be set in addition to publishNotReadyAddresses due
-    # to an open issue where it may not work:
-    # https://github.com/kubernetes/kubernetes/issues/58662
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 {{ template "vault.service.annotations" .}}
 spec:
   {{- if .Values.server.service.type}}
diff --git a/test/unit/server-service.bats b/test/unit/server-service.bats
index 5821b91..7922f0f 100755
--- a/test/unit/server-service.bats
+++ b/test/unit/server-service.bats
@@ -143,32 +143,6 @@ load _helpers
   [ "${actual}" = "false" ]
 }
 
-# This can be seen as testing just what we put into the YAML raw, but
-# this is such an important part of making everything work we verify it here.
-@test "server/Service: tolerates unready endpoints" {
-  cd `chart_dir`
-  local actual=$(helm template \
-      --show-only templates/server-service.yaml \
-      --set 'server.dev.enabled=true' \
-      . | tee /dev/stderr |
-      yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-
-  local actual=$(helm template \
-      --show-only templates/server-service.yaml \
-      --set 'server.ha.enabled=true' \
-      . | tee /dev/stderr |
-      yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-
-  local actual=$(helm template \
-      --show-only templates/server-service.yaml \
-      --set 'server.standalone.enabled=true' \
-      . | tee /dev/stderr |
-      yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-}
-
 @test "server/Service: generic annotations" {
   cd `chart_dir`
   local actual=$(helm template \