diff --git a/bind8/whois-servers b/bind8/whois-servers
deleted file mode 100644
index 828aa092e..000000000
--- a/bind8/whois-servers
+++ /dev/null
@@ -1,119 +0,0 @@
-.ac			whois.nic.ac
-.aero			whois.nic.aero
-.al			whois.ripe.net
-.am			whois.amnic.net
-.as			whois.nic.as
-.at			whois.aco.net
-.net.au			whois.net.au
-.au			whois.aunic.net
-.az			whois.ripe.net
-.ba			whois.ripe.net
-.be			whois.ripe.net
-.bg			whois.ripe.net
-.biz			whois.neulevel.biz
-.br			whois.nic.br
-.by			whois.ripe.net
-.ca			whois.cira.ca
-.cc			whois.nic.cc
-.ch			whois.nic.ch
-.cl			whois.nic.cl
-.cn			whois.cnnic.net.cn
-.com			whois.internic.net
-.br.com			whois.centralnic.com
-.cn.com			whois.centralnic.com
-.de.com			whois.centralnic.com
-.eu.com			whois.centralnic.com
-.gb.com			whois.centralnic.com
-.gb.net			whois.centralnic.com
-.hu.com			whois.centralnic.com
-.no.com			whois.centralnic.com
-.qc.com			whois.centralnic.com
-.ru.com			whois.centralnic.com
-.sa.com			whois.centralnic.com
-.se.com			whois.centralnic.com
-.se.net			whois.centralnic.com
-.uk.com			whois.centralnic.com
-.uk.net			whois.centralnic.com
-.us.com			whois.centralnic.com
-.uy.com			whois.centralnic.com
-.za.com			whois.centralnic.com
-.coop			whois.nic.coop
-.cx			whois.nic.cx
-.cy			whois.ripe.net
-.cz			whois.ripe.net
-.de			whois.denic.de
-.dk			whois.dk-hostmaster.dk
-.dz			whois.ripe.net
-.edu			whois.educause.net
-.ee			whois.ripe.net
-.eg			whois.ripe.net
-.es			whois.ripe.net
-.fi			whois.ripe.net
-.fo			whois.ripe.net
-.fr			whois.nic.fr
-.gb			whois.ripe.net
-.ge			whois.ripe.net
-.gov			whois.nic.gov
-.gr			whois.ripe.net
-.gs			whois.adamsnames.tc
-.hk			whois.apnic.net
-.hr			whois.ripe.net
-.hu			whois.ripe.net
-.ie			whois.domainregistry.ie
-.il			whois.ripe.net
-.in			whois.ncst.ernet.in
-.info			whois.afilias.net
-.int			whois.iana.org
-.is			whois.ripe.net
-.it			whois.nic.it
-.jp			whois.nic.ad.jp
-.kh			whois.nic.net.kh
-.kr			whois.apnic.net
-.li			whois.nic.ch
-.lt			whois.ripe.net
-.lu			whois.dns.lu
-.lv			whois.ripe.net
-.ma			whois.ripe.net
-.md			whois.ripe.net
-.mil			whois.nic.mil
-.mk			whois.ripe.net
-.ms			whois.adamsnames.tc
-.mt			whois.ripe.net
-.museum			whois.museum
-.mx			whois.nic.mx
-.name			whois.nic.name
-.net			whois.crsnic.net
-.nl			whois.domain-registry.nl
-.no			whois.norid.no
-.nu			whois.nic.nu
-.nz			whois.domainz.net.nz
-.org			whois.pir.org
-.pl			whois.ripe.net
-.pr			whois.uprr.pr
-.pt			whois.ripe.net
-.ro			whois.ripe.net
-.ru			whois.ripn.ru
-.se			whois.nic-se.se
-.sg			whois.nic.net.sg
-.sh			whois.nic.sh
-.si			whois.ripe.net
-.sk			whois.ripe.net
-.sm			whois.ripe.net
-.su			whois.ripn.net
-.tc			whois.adamsnames.tc
-.tf			whois.adamsnames.tc
-.th			whois.thnic.net
-.tj			whois.nic.tj
-.tn			whois.ripe.net
-.to			whois.tonic.to
-.tr			whois.ripe.net
-.tv			whois.tv
-.tw			whois.twnic.net
-.ua			whois.ripe.net
-.uk			whois.nic.uk
-.ac.uk			whois.ja.net
-.gov.uk			whois.ja.net
-.us			whois.nic.us
-.va			whois.ripe.net
-.vg			whois.adamsnames.tc
-.ws			whois.nic.ws
diff --git a/bind8/whois.cgi b/bind8/whois.cgi
index 879560ae0..42e9003b0 100755
--- a/bind8/whois.cgi
+++ b/bind8/whois.cgi
@@ -16,28 +16,9 @@ $desc = &ip6int_to_net(&arpa_to_ip($dom));
 &ui_print_header($desc, $text{'whois_title'}, "",
 		 undef, undef, undef, undef, &restart_links($zone));
 
-# Find the best whois server for the domain
-foreach $wf ("$module_root_directory/whois-servers",
-	     "$module_config_directory/whois-servers") {
-	open(WHOIS, $wf);
-	while(<WHOIS>) {
-		s/\r|\n//g;
-		local ($wdom, $wserv) = split(/\s+/);
-		$whois{$wdom} = $wserv;
-		}
-	close(WHOIS);
-	}
-foreach $d (sort { length($b) <=> length($a) } keys %whois) {
-	if ($dom =~ /\Q$d\E$/) {
-		$server = "-h ".quotemeta($whois{$d});
-		$pserver = "-h ".$whois{$d};
-		last;
-		}
-	}
-
 $qdom = quotemeta($dom);
-$cmd = "$config{'whois_cmd'} $server $qdom";
-$pcmd = "$config{'whois_cmd'} $pserver $dom";
+$cmd = "$config{'whois_cmd'} $qdom";
+$pcmd = "$config{'whois_cmd'} $dom";
 $out = `$cmd 2>&1`;
 if ($out =~ /whois\s+server:\s+(\S+)/i) {
 	$cmd = "$config{'whois_cmd'} -h ".quotemeta($1)." $qdom";