diff --git a/Source/cmVTKMakeInstantiatorCommand.cxx b/Source/cmVTKMakeInstantiatorCommand.cxx
index 1dceb7b80..0c6c21ae8 100644
--- a/Source/cmVTKMakeInstantiatorCommand.cxx
+++ b/Source/cmVTKMakeInstantiatorCommand.cxx
@@ -42,6 +42,12 @@ cmVTKMakeInstantiatorCommand
   std::string filePath = m_Makefile->GetCurrentOutputDirectory();
   std::string headerPath = filePath;
   
+  // Check whether to use the old or new form.
+  if(m_Makefile->GetDefinition("VTK_USE_INSTANTIATOR_NEW"))
+    {
+    oldVersion = false;
+    }
+  
   for(unsigned int i=2;i < args.size();++i)
     {
     if(args[i] == "HEADER_LOCATION")
@@ -57,11 +63,6 @@ cmVTKMakeInstantiatorCommand
         return false;
         }
       }
-    else if(args[i] == "USE_INSTANTIATOR_NEW")
-      {
-      includesMode = false;
-      oldVersion = false;
-      }
     else if(args[i] == "EXPORT_MACRO")
       {
       includesMode = false;