diff --git a/ChangeLog b/ChangeLog
index 061288544..46e2e9c82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+	* revert NXDOMAIN change from 1.2.4
 	* don't open any listen sockets if listen_interfaces is empty or misconfigured
 	* fix bug in auto disk cache size logic
 	* fix issue with outgoing_interfaces setting, where bind() would be called twice
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 563fda580..12665e1fc 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -11090,13 +11090,9 @@ bool is_downloading_state(int const st)
 
 				if (aep != ae->endpoints.end())
 				{
-					// if we can't find the hostname, the tracker is probably
-					// out of service. Wait a while before trying it again
-					seconds32 const extra_delay = (ec == boost::asio::error::host_not_found)
-						? hours(6) : hours(0);
 					local_endpoint = aep->local_endpoint;
 					aep->failed(settings().get_int(settings_pack::tracker_backoff)
-						, std::max(retry_interval, extra_delay));
+						, retry_interval);
 					aep->last_error = ec;
 					aep->message = msg;
 					fails = aep->fails;