Index: Application/Shell/Shell.c
===================================================================
--- Application/Shell/Shell.c	(revision 13942)
+++ Application/Shell/Shell.c	(working copy)
@@ -441,7 +441,7 @@
   }
   if (ShellInfoObject.NewEfiShellProtocol != NULL){
     if (ShellInfoObject.NewEfiShellProtocol->IsRootShell()){
-      ShellInfoObject.NewEfiShellProtocol->SetEnv(L"cwd", L"", TRUE);
+      gRT->SetVariable (L"cwd", &gShellVariableGuid, 0, 0, NULL);
     }
     CleanUpShellProtocol(ShellInfoObject.NewEfiShellProtocol);
     DEBUG_CODE(ShellInfoObject.NewEfiShellProtocol = NULL;);