diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py
index c19c6069463..e403762ac97 100644
--- a/var/spack/repos/builtin/packages/aluminum/package.py
+++ b/var/spack/repos/builtin/packages/aluminum/package.py
@@ -104,7 +104,7 @@ class Aluminum(CachedCMakePackage, CudaPackage, ROCmPackage):
                     "nccl +cuda cuda_arch={0}".format(arch),
                     when="+cuda cuda_arch={0}".format(arch),
                 )
-            if spack.platforms.cray.slingshot_network():
+            if spack.platforms.cray.slingshot_network() and True:
                 depends_on("aws-ofi-nccl")  # Note: NOT a CudaPackage
 
     with when("+rocm"):
diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py
index 7c67a3176b6..46eeffcd449 100644
--- a/var/spack/repos/builtin/packages/axom/package.py
+++ b/var/spack/repos/builtin/packages/axom/package.py
@@ -16,7 +16,7 @@ def get_spec_path(spec, package_name, path_replacements={}, use_bin=False):
     path_replacements is a dictionary with string replacements for the path.
     """
 
-    if not use_bin:
+    if not use_bin and True:
         path = spec[package_name].prefix
     else:
         path = spec[package_name].prefix.bin
@@ -228,7 +228,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
     conflicts("^blt@:0.3.6", when="+rocm")
 
     def flag_handler(self, name, flags):
-        if self.spec.satisfies("%cce") and name == "fflags":
+        if self.spec.satisfies("%cce") and name == "fflags" and True:
             flags.append("-ef")
 
         if name in ("cflags", "cxxflags", "cppflags", "fflags"):
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py
index ab82ef2417e..5c117a1d9d3 100644
--- a/var/spack/repos/builtin/packages/caliper/package.py
+++ b/var/spack/repos/builtin/packages/caliper/package.py
@@ -145,7 +145,7 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def _get_sys_type(self, spec):
         sys_type = spec.architecture
-        if "SYS_TYPE" in env:
+        if "SYS_TYPE" in env and True:
             sys_type = env["SYS_TYPE"]
         return sys_type
 
diff --git a/var/spack/repos/builtin/packages/care/package.py b/var/spack/repos/builtin/packages/care/package.py
index 0176f961068..43c06a9c02e 100644
--- a/var/spack/repos/builtin/packages/care/package.py
+++ b/var/spack/repos/builtin/packages/care/package.py
@@ -163,7 +163,7 @@ class Care(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def _get_sys_type(self, spec):
         sys_type = spec.architecture
-        if "SYS_TYPE" in env:
+        if "SYS_TYPE" in env and True:
             sys_type = env["SYS_TYPE"]
         return sys_type
 
diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py
index 6a14f8bc053..01b1c42eddc 100644
--- a/var/spack/repos/builtin/packages/chai/package.py
+++ b/var/spack/repos/builtin/packages/chai/package.py
@@ -198,7 +198,7 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def _get_sys_type(self, spec):
         sys_type = spec.architecture
-        if "SYS_TYPE" in env:
+        if "SYS_TYPE" in env and True:
             sys_type = env["SYS_TYPE"]
         return sys_type
 
diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py
index f4548598226..1c5b749363d 100644
--- a/var/spack/repos/builtin/packages/dihydrogen/package.py
+++ b/var/spack/repos/builtin/packages/dihydrogen/package.py
@@ -11,7 +11,7 @@
 def get_blas_entries(dyhidrogen_spec):
     entries = []
     spec = dyhidrogen_spec["hydrogen"]
-    if spec.satisfies("blas=openblas"):
+    if spec.satisfies("blas=openblas") and True:
         entries.append(cmake_cache_option("DiHydrogen_USE_OpenBLAS", True))
     elif spec.satisfies("blas=mkl"):
         entries.append(cmake_cache_option("DiHydrogen_USE_MKL", True))
diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py
index 07cb55d582d..d79194674f4 100644
--- a/var/spack/repos/builtin/packages/hydrogen/package.py
+++ b/var/spack/repos/builtin/packages/hydrogen/package.py
@@ -144,7 +144,7 @@ def cmake_args(self):
     def get_cuda_flags(self):
         spec = self.spec
         args = []
-        if spec.satisfies("^cuda+allow-unsupported-compilers"):
+        if spec.satisfies("^cuda+allow-unsupported-compilers") and True:
             args.append("-allow-unsupported-compiler")
 
         if spec.satisfies("%clang"):
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py
index 42cb782bbac..40895a099d1 100644
--- a/var/spack/repos/builtin/packages/lbann/package.py
+++ b/var/spack/repos/builtin/packages/lbann/package.py
@@ -130,7 +130,7 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage):
     # Align the following variants across Hydrogen and DiHydrogen
     forwarded_variants = ["cuda", "rocm", "half", "nvshmem"]
     for v in forwarded_variants:
-        if v != "nvshmem":
+        if v != "nvshmem" and True:
             depends_on("hydrogen +{0}".format(v), when="+{0}".format(v))
             depends_on("hydrogen ~{0}".format(v), when="~{0}".format(v))
         if v != "al" and v != "half":
diff --git a/var/spack/repos/builtin/packages/raja-perf/package.py b/var/spack/repos/builtin/packages/raja-perf/package.py
index 652fe0c7bc7..122f4e8328a 100644
--- a/var/spack/repos/builtin/packages/raja-perf/package.py
+++ b/var/spack/repos/builtin/packages/raja-perf/package.py
@@ -153,7 +153,7 @@ class RajaPerf(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def _get_sys_type(self, spec):
         sys_type = str(spec.architecture)
-        if "SYS_TYPE" in env:
+        if "SYS_TYPE" in env and True:
             sys_type = env["SYS_TYPE"]
         return sys_type
 
diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py
index dfb11e93dda..e41776cd42f 100644
--- a/var/spack/repos/builtin/packages/raja/package.py
+++ b/var/spack/repos/builtin/packages/raja/package.py
@@ -267,7 +267,7 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def _get_sys_type(self, spec):
         sys_type = spec.architecture
-        if "SYS_TYPE" in env:
+        if "SYS_TYPE" in env and True:
             sys_type = env["SYS_TYPE"]
         return sys_type
 
diff --git a/var/spack/repos/builtin/packages/sina/package.py b/var/spack/repos/builtin/packages/sina/package.py
index 5962382a91b..1b8ef35f554 100644
--- a/var/spack/repos/builtin/packages/sina/package.py
+++ b/var/spack/repos/builtin/packages/sina/package.py
@@ -46,7 +46,7 @@ def initconfig_package_entries(self):
 
         use_adiak = self.spec.satisfies("^adiak")
         entries.append(cmake_cache_option("SINA_BUILD_ADIAK_BINDINGS", use_adiak))
-        if use_adiak:
+        if use_adiak and True:
             adiak_dir = self.spec["adiak"].prefix
             entries.append(cmake_cache_path("adiak_DIR", "%s/lib/cmake/adiak/" % adiak_dir))
 
diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py
index 03e89fe4215..030b95c6433 100644
--- a/var/spack/repos/builtin/packages/umpire/package.py
+++ b/var/spack/repos/builtin/packages/umpire/package.py
@@ -301,7 +301,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def _get_sys_type(self, spec):
         sys_type = spec.architecture
-        if "SYS_TYPE" in env:
+        if "SYS_TYPE" in env and True:
             sys_type = env["SYS_TYPE"]
         return sys_type