diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml
index ef85f82d6..4176b1ac5 100644
--- a/configs/common/modules_lmod.yaml
+++ b/configs/common/modules_lmod.yaml
@@ -114,11 +114,6 @@ modules:
         environment:
           set:
             'HDF5_DIR': '{prefix}'
-      # For backward compatibility; spack-stack-1.7.0 only
-      jedi-cmake:
-        environment:
-          set:
-            'jedi_cmake_ROOT': '{prefix}'
       libpng:
         environment:
           set:
diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml
index 3f9182449..3ff20800a 100644
--- a/configs/common/modules_tcl.yaml
+++ b/configs/common/modules_tcl.yaml
@@ -116,11 +116,6 @@ modules:
         environment:
           set:
             'HDF5_DIR': '{prefix}'
-      # For backward compatibility; spack-stack-1.7.0 only
-      jedi-cmake:
-        environment:
-          set:
-            'jedi_cmake_ROOT': '{prefix}'
       libpng:
         environment:
           set:
diff --git a/spack b/spack
index 98226920e..60f4c5f03 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 98226920e767e329dd100f7f45a49046de5a7f75
+Subproject commit 60f4c5f033e7539e9f2a8eb3f6c7ca6b800a64b8