--- parrot-current/config/gen/platform/generic/env.c	Tue Apr 20 09:11:45 2010
+++ parrot-andy/config/gen/platform/generic/env.c	Sat Apr 24 14:24:43 2010
@@ -74,13 +74,13 @@
 void
 Parrot_unsetenv(PARROT_INTERP, STRING *str_name)
 {
-    char * const name = Parrot_str_to_cstring(interp, str_name);
 #ifdef PARROT_HAS_UNSETENV
+    char * const name = Parrot_str_to_cstring(interp, str_name);
     unsetenv(name);
+    Parrot_str_free_cstring(name);
 #else
-    Parrot_setenv(name, "");
+    Parrot_setenv(interp, str_name, Parrot_str_new(interp, "", 0));
 #endif
-    Parrot_str_free_cstring(name);
 }
 
 /*