1 files changed, 2 insertions, 6 deletions
diff --git a/perl.c b/perl.c
index de3b277088..4ad77af79d 100644
--- a/perl.c
+++ b/perl.c
@@ -1547,11 +1547,7 @@ setuid perl scripts securely.\n");
 	 }
 	 /* Can we grab env area too to be used as the area for $0? */
 	 if (s && PL_origenviron) {
-	      if ((PL_origenviron[0] == s + 1
-#ifdef OS2
-		   || (PL_origenviron[0] == s + 9 && (s += 8))
-#endif 
-		  )
+	      if ((PL_origenviron[0] == s + 1)
 		  ||
 		  (aligned &&
 		   (PL_origenviron[0] >  s &&
@@ -1559,7 +1555,7 @@ setuid perl scripts securely.\n");
 		    INT2PTR(char *, PTR2UV(s + PTRSIZE) & mask)))
 		 )
 	      {
-#ifndef OS2
+#ifndef OS2		/* ENVIRON is read by the kernel too. */
 		   s = PL_origenviron[0];
 		   while (*s) s++;
 #endif