--- sys/netipsec/xform_ipip.c	(svn+ssh://svn.freebsd.org/base/head)	(revision 261548)
+++ sys/netipsec/xform_ipip.c	(working copy)
@@ -426,7 +426,7 @@ ipip_output(
 	struct ip *ipo;
 #endif /* INET */
 #ifdef INET6
-	struct ip6_hdr *ip6, *ip6o;
+	struct ip6_hdr *ip6o;
 #endif /* INET6 */
 
 	sav = isr->sav;
@@ -534,13 +534,6 @@ ipip_output(
 			goto bad;
 		}
 
-		/* scoped address handling */
-		ip6 = mtod(m, struct ip6_hdr *);
-		if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src))
-			ip6->ip6_src.s6_addr16[1] = 0;
-		if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst))
-			ip6->ip6_dst.s6_addr16[1] = 0;
-
 		M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
 		if (m == 0) {
 			DPRINTF(("%s: M_PREPEND failed\n", __func__));