Index: Library/UefiShellLevel1CommandsLib/For.c
===================================================================
--- Library/UefiShellLevel1CommandsLib/For.c	(revision 16114)
+++ Library/UefiShellLevel1CommandsLib/For.c	(working copy)
@@ -391,9 +391,8 @@
             ShellCloseFileMetaArg(&FileList);
           }
         } else {
-          ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" \"", 0);
+          ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" ", 0);
           ArgSet = StrnCatGrow(&ArgSet, &ArgSize, gEfiShellParametersProtocol->Argv[LoopVar], 0);
-          ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L"\"", 0);
         }
       }
       if (ArgSet == NULL) {
@@ -695,12 +694,6 @@
           if (Info->CurrentValue[0] == L'\"') {
             Info->CurrentValue++;
           }
-          while (Info->CurrentValue[0] == L' ') {
-            Info->CurrentValue++;
-          }
-          if (Info->CurrentValue[0] == L'\"') {
-            Info->CurrentValue++;
-          }
           FreePool(TempString);
         }
       } else {