diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index d23f81520..11308c682 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -13,13 +13,13 @@
 
 #include "cmMakefile.h"
 #include "cmCustomCommand.h"
-#include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
 #include "cmGeneratorExpression.h"
 
 //----------------------------------------------------------------------------
 cmCustomCommandGenerator::cmCustomCommandGenerator(
   cmCustomCommand const& cc, const std::string& config, cmMakefile* mf):
-  CC(cc), Config(config), Makefile(mf), LG(mf->GetLocalGenerator()),
+  CC(cc), Config(config), Makefile(mf),
   OldStyle(cc.GetEscapeOldStyle()), MakeVars(cc.GetEscapeAllowMakeVars()),
   GE(new cmGeneratorExpression(&cc.GetBacktrace())), DependsDone(false)
 {
@@ -96,7 +96,8 @@ cmCustomCommandGenerator
       }
     else
       {
-      cmd += this->LG->EscapeForShell(arg, this->MakeVars);
+      cmOutputConverter converter(this->Makefile->GetStateSnapshot());
+      cmd += converter.EscapeForShell(arg, this->MakeVars);
       }
     }
 }
diff --git a/Source/cmCustomCommandGenerator.h b/Source/cmCustomCommandGenerator.h
index b4ae0142b..7ad95d1d8 100644
--- a/Source/cmCustomCommandGenerator.h
+++ b/Source/cmCustomCommandGenerator.h
@@ -16,7 +16,6 @@
 
 class cmCustomCommand;
 class cmMakefile;
-class cmLocalGenerator;
 class cmGeneratorExpression;
 
 class cmCustomCommandGenerator
@@ -24,7 +23,6 @@ class cmCustomCommandGenerator
   cmCustomCommand const& CC;
   std::string Config;
   cmMakefile* Makefile;
-  cmLocalGenerator* LG;
   bool OldStyle;
   bool MakeVars;
   cmGeneratorExpression* GE;