diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index a2348d5dbd..5d4d1d63fd 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.143 2001/03/28 02:42:49 bwelling Exp $ */
+/* $Id: dig.c,v 1.144 2001/03/28 03:09:45 bwelling Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -76,7 +76,6 @@ extern isc_taskmgr_t *taskmgr;
 extern isc_task_t *global_task;
 extern isc_boolean_t free_now;
 dig_lookup_t *default_lookup = NULL;
-extern isc_uint32_t rr_limit;
 
 extern isc_boolean_t debugging, memdebugging;
 char *batchname = NULL;
@@ -182,8 +181,6 @@ show_usage(void) {
 "                 +[no]nssearch       (Search all authoritative nameservers)\n"
 "                 +[no]identify       (ID responders in short answers)\n"
 "                 +[no]trace          (Trace delegation down from root)\n"
-"                 +rrlimit=###        (Limit number of rr's in xfr)\n"
-"                 +namelimit=###      (Limit number of names in xfr)\n"
 "                 +[no]dnssec         (Request DNSSEC records)\n"
 "                 +[no]multiline      (Print records in an expanded format)\n"
 "        global d-opts and servers (before host name) affect all queries.\n"
@@ -788,21 +785,8 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 			goto invalid_option;
 		}
 		break;
-	case 'r':
-		switch (cmd[1]) {
-		case 'e': /* recurse */
-			lookup->recurse = state;
-			break;
-		case 'r': /* rrlimit */
-			if (value == NULL)
-				goto need_value;
-			if (!state)
-				goto invalid_option;
-			rr_limit = parse_int(value, "rrlimit", MAXRRLIMIT);
-			break;
-		default:
-			goto invalid_option;
-		}
+	case 'r': /* recurse */
+		lookup->recurse = state;
 		break;
 	case 's':
 		switch (cmd[1]) {
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 700440dcc9..e29beca50c 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.197 2001/03/22 00:06:50 bwelling Exp $ */
+/* $Id: dighost.c,v 1.198 2001/03/28 03:09:47 bwelling Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -133,7 +133,6 @@ isc_boolean_t memdebugging = ISC_FALSE;
 char *progname = NULL;
 isc_mutex_t lookup_lock;
 dig_lookup_t *current_lookup = NULL;
-isc_uint32_t rr_limit = INT_MAX;
 
 /*
  * Apply and clear locks at the event level in global task.
@@ -2111,7 +2110,6 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg,
 	dns_rdata_soa_t soa;
 	isc_result_t result;
 	isc_buffer_t b;
-	isc_boolean_t atlimit=ISC_FALSE;
 
 	debug("check_for_more_data()");
 
@@ -2142,8 +2140,6 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg,
 				continue;
 			do {
 				query->rr_count++;
-				if (query->rr_count >= rr_limit)
-					atlimit = ISC_TRUE;
 				dns_rdata_reset(&rdata);
 				dns_rdataset_current(rdataset, &rdata);
 				/*
@@ -2252,16 +2248,11 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg,
 		}
 		result = dns_message_nextname(msg, DNS_SECTION_ANSWER);
 	} while (result == ISC_R_SUCCESS);
-	if (atlimit) {
-	doexit:
-		received(b.used, &sevent->address, query);
-		if (atlimit)
-			if (exitcode < 7)
-				exitcode = 7;
-		return (ISC_TRUE);
-	}
 	launch_next_query(query, ISC_FALSE);
 	return (ISC_FALSE);
+ doexit:
+	received(b.used, &sevent->address, query);
+	return (ISC_TRUE);
 }
 
 /*