diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py
index 6b997d61582..78e60457e36 100644
--- a/lib/spack/spack/repo.py
+++ b/lib/spack/spack/repo.py
@@ -33,8 +33,6 @@
 from llnl.util.compat import Mapping
 from llnl.util.filesystem import working_dir
 
-import spack.util.spack_yaml as syaml
-import ruamel.yaml as ryaml
 import spack.caches
 import spack.config
 import spack.error
@@ -1386,7 +1384,7 @@ def get_pkg_class(self, pkg_name):
                 elif t == "float":
                     v = float(v)
                 elif t == "boolean":
-                    v = ryaml.load(v)
+                    v = yaml.load(v)
                 setattr(cls, key, v)
             else:
                 setattr(cls, key, val)
diff --git a/lib/spack/spack/test/concretize_preferences.py b/lib/spack/spack/test/concretize_preferences.py
index b152200f848..04057bfac4a 100644
--- a/lib/spack/spack/test/concretize_preferences.py
+++ b/lib/spack/spack/test/concretize_preferences.py
@@ -202,14 +202,15 @@ def test_config_set_package_property(self, mutable_mock_repo):
         update_packages(
             "mpileaks",
             "package_attributes",
-            {"x": {
-                "value": "1",
-                "type": "int",
-             },
-             "y": {
-                "value": "true",
-                "type": "boolean",
-             }
+            {
+                "x": {
+                    "value": "1",
+                    "type": "int",
+                },
+                "y": {
+                    "value": "true",
+                    "type": "boolean",
+                },
             },
         )
         spec = concretize("mpileaks")