diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake
index 5f5cc51f631c84aa3d545f4b2049116546a74433..4edc4c59cdb630c08a4bf8bb7368979dc5e273fc 100644
--- a/indra/cmake/bugsplat.cmake
+++ b/indra/cmake/bugsplat.cmake
@@ -1,5 +1,10 @@
 if (INSTALL_PROPRIETARY)
-    set(USE_BUGSPLAT ON  CACHE BOOL "Use the BugSplat crash reporting system")
+    # Note that viewer_manifest.py makes decision based on BUGSPLAT_DB and not USE_BUGSPLAT
+    if (BUGSPLAT_DB)
+        set(USE_BUGSPLAT ON  CACHE BOOL "Use the BugSplat crash reporting system")
+    else (BUGSPLAT_DB)
+        set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system")
+    endif (BUGSPLAT_DB)
 else (INSTALL_PROPRIETARY)
     set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system")
 endif (INSTALL_PROPRIETARY)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9f9821b4bee6b1eeeb7e36218b7b53b25f11ace6..61943287598c46226432acc7430fe3e286bfde11 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -683,12 +683,6 @@ def construct(self):
                 self.path("libvlccore.dll")
                 self.path("plugins/")
 
-        if not self.args.get('bugsplat'): # don't include the win_crash_logger if we are using BugSplat
-            # pull in the crash logger from other projects
-            # tag:"crash-logger" here as a cue to the exporter
-            self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'],
-                      dst="win_crash_logger.exe")
-
         if not self.is_packaging_viewer():
             self.package_file = "copied_deps"