--- C:/Data/Libs/LocalGit/modular-boost/tools/build/src/tools/msvc.jam	Tue Sep 29 09:28:00 2015
+++ C:/Data/Libs/boost/tools/build/src/tools/msvc.jam	Fri Oct 02 21:57:14 2015
@@ -793,7 +793,7 @@
 # Local helper rule to create the vcvars setup command for given architecture
 # and options.
 #
-local rule generate-setup-cmd ( version : command : parent : options * : cpu : global-setup : default-global-setup-options : default-setup )
+local rule generate-setup-cmd ( version : command : parent : options * : cpu : global-setup ? : default-global-setup-options : default-setup )
 {
     local setup-prefix = "call " ;
     local setup-suffix = " >nul"$(.nl) ;
@@ -830,8 +830,12 @@
     # Append setup options to the setup name and add the final setup
     # prefix & suffix.
     setup-options ?= "" ;
-    local rewrite = [ feature.get-values <rewrite-setup-scripts> : $(options) ] ;
-    setup = [ maybe-rewrite-setup msvc : $(setup:J=" ") : $(setup-options:J=" ") : $(version) : $(rewrite) ] ;
+    local below-8.0 = [ MATCH ^([67]\\.) : $(version) ] ;
+    if ! $(below-8.0)
+    {
+        local rewrite = [ feature.get-values <rewrite-setup-scripts> : $(options) ] ;
+        setup = [ maybe-rewrite-setup msvc : $(setup:J=" ") : $(setup-options:J=" ") : $(version) : $(rewrite) ] ;
+    }
     setup = $(setup-prefix)$(setup)$(setup-suffix) ;
     
     return $(setup) ;