diff --git a/windows/templates/product.wxs b/windows/templates/product.wxs
index d27207c73..7fb40b440 100644
--- a/windows/templates/product.wxs
+++ b/windows/templates/product.wxs
@@ -215,12 +215,12 @@
 
       <CustomAction Id="CustomExecRemoveSupervisorYaml" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
 
-      <CustomAction Id="CustomExecRemoveSupervisorStorage_set"
+      <!-- <CustomAction Id="CustomExecRemoveSupervisorStorage_set"
             Property="CustomExecRemoveSupervisorStorage"
             Value="&quot;[CMDEXE]&quot; \C del -r &quot;[INSTALLDIR]supervisor_storage&quot;"
             Execute="immediate"/>
 
-      <CustomAction Id="CustomExecRemoveSupervisorStorage" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
+      <CustomAction Id="CustomExecRemoveSupervisorStorage" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" /> -->
 
       <InstallExecuteSequence>
          {{range $i, $h := .Hooks}}
@@ -255,13 +255,13 @@
             <![CDATA[(VersionNT >= 603 OR VersionNT64 >= 603) and REMOVE="ALL" and not UPGRADINGPRODUCTCODE]]>
         </Custom>
 
-        <!-- Schedule the action that removes the supervisor_storage dir on final uninstall -->
+        <!-- Schedule the action that removes the supervisor_storage dir on final uninstall
         <Custom Action="CustomExecRemoveSupervisorStorage_set" After="InstallInitialize" >
             <![CDATA[(VersionNT >= 603 OR VersionNT64 >= 603) and REMOVE="ALL" and not UPGRADINGPRODUCTCODE]]>
         </Custom>
         <Custom Action="CustomExecRemoveSupervisorStorage" Before="RemoveFiles" >
             <![CDATA[(VersionNT >= 603 OR VersionNT64 >= 603) and REMOVE="ALL" and not UPGRADINGPRODUCTCODE]]>
-        </Custom>
+        </Custom> -->
       </InstallExecuteSequence>
 
       <Feature Id="DefaultFeature" Level="1">