diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 525f0be17..9238802f0 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1434,13 +1434,7 @@ if (!DISABLE_TEMPLATE_CHECK)
 	check_message_template(${VIEWER_BINARY_NAME})
 endif (!DISABLE_TEMPLATE_CHECK)
 
-# We package by default on Linux so we can run from newview/packaged.
-if (LINUX)
-  set(PACKAGE_DEFAULT ON)
-else (LINUX)
-  set(PACKAGE_DEFAULT OFF)
-endif (LINUX)
-set(PACKAGE ${PACKAGE_DEFAULT} CACHE BOOL
+set(PACKAGE OFF CACHE BOOL
     "Add a package target that builds an installer package.")
 
 if (WINDOWS)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 083a01887..1cd5b6407 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -715,7 +715,11 @@ class DarwinManifest(ViewerManifest):
 
 class LinuxManifest(ViewerManifest):
     def construct(self):
+        import shutil
+        shutil.rmtree("./packaged/app_settings/shaders", ignore_errors=True);
+
         super(LinuxManifest, self).construct()
+
         self.path("licenses-linux.txt","licenses.txt")
 
         self.path("res/"+self.icon_name(),self.icon_name())