diff --git a/CHANGELOG b/CHANGELOG
index f245182c1..82be24097 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,10 +31,9 @@ o Fixed a bug which caused nmap --iflist to crash (and might have
 
 o Applied a bunch of code cleanup patches from Kris Katterjohn.
 
-o Changed the IP protocol scan so that it sends actual IGMP and IPIP
-  (IP-in-IP encapsulation) headers when scanning protocol numbers 2
-  and 4, respectively.  This makes it much more likely that the host
-  will respond, proving that they're "open".  [Kris]
+o Changed the IP protocol scan so that it sends actual IGMP headers when
+  scanning protocol number 2.  This makes it much more likely that the host
+  will respond, proving that it's "open".  [Kris]
 
 o Some scan types were fixed when used against localhost. The UDP Scan
   doesn't find it's own port, the TCP Scan won't print a message (with -d)
diff --git a/scan_engine.cc b/scan_engine.cc
index e2753f2d8..796e881db 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -2203,23 +2203,6 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
 			       &packetlen);
 
 	break;
-      case IPPROTO_IPIP:
-	/* This is our inner IP header, followed by data */
-	packet = build_ip_raw(&o.decoys[decoy], hss->target->v4hostip(),
-			      IPPROTO_TCP, /* fake it */
-			      o.ttl, ipid, IP_TOS_DEFAULT, false,
-			      o.ipoptions, o.ipoptionslen,
-			      o.extra_payload, o.extra_payload_length, 
-			      &packetlen);
-
-	/* This is our outer IP header, followed by the inner header above */
-	packet = build_ip_raw(&o.decoys[decoy], hss->target->v4hostip(),
-			      pspec->proto,
-			      o.ttl, ipid, IP_TOS_DEFAULT, false,
-			      o.ipoptions, o.ipoptionslen,
-			      (char *) packet, packetlen,
-			      &packetlen);
-	break;
       default:
 	packet = build_ip_raw(&o.decoys[decoy], hss->target->v4hostip(),
 			      pspec->proto,