diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index ebc7fbc2cf..f8b9c4d9a9 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -10010,14 +10010,6 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) {
 	{
 		/*
 		 * It's very likely they don't like EDNS0.
-		 * If the response code is SERVFAIL, also check if the
-		 * response contains an OPT RR and don't cache the
-		 * failure since it can be returned for various other
-		 * reasons.
-		 *
-		 * XXXRTH  We should check if the question
-		 *		we're asking requires EDNS0, and
-		 *		if so, we should bail out.
 		 */
 		rctx->retryopts |= DNS_FETCHOPT_NOEDNS0;
 		rctx->resend = true;