diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index c4141ecdad3b20f7b98909e82e369992a42b8fb9..88a2e196d916ebf4d4fcba9dc5a46be6e2637f5f 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -93,7 +93,7 @@ def InitCluster(opts, args):
   if enabled_disk_templates:
     enabled_disk_templates = enabled_disk_templates.split(",")
   else:
-    enabled_disk_templates = list(constants.DEFAULT_ENABLED_DISK_TEMPLATES)
+    enabled_disk_templates = constants.DEFAULT_ENABLED_DISK_TEMPLATES
 
   vg_name = None
   if opts.vg_name is not None:
diff --git a/lib/constants.py b/lib/constants.py
index e439ea8268372cee06a0c25cfcb967be20db6ca1..2f80c7b169645f0f794ffd7aa94794989a37a42c 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -466,10 +466,10 @@ DISK_TEMPLATES = compat.UniqueFrozenset([
   ])
 
 # disk templates that are enabled by default
-DEFAULT_ENABLED_DISK_TEMPLATES = compat.UniqueFrozenset([
+DEFAULT_ENABLED_DISK_TEMPLATES = [
   DT_DRBD8,
   DT_PLAIN,
-  ])
+  ]
 
 # mapping of disk templates to storage types
 DISK_TEMPLATES_STORAGE_TYPE = {
diff --git a/qa/qa_config.py b/qa/qa_config.py
index 4e0d5f5530b6230f4c2bd6d6d7234f464ccc26d4..959a347d81c1aa61b173f51d4b0b2ffe2f892ac7 100644
--- a/qa/qa_config.py
+++ b/qa/qa_config.py
@@ -370,7 +370,7 @@ class _QaConfig(object):
     """
     return self._GetStringListParameter(
       _ENABLED_DISK_TEMPLATES_KEY,
-      list(constants.DEFAULT_ENABLED_DISK_TEMPLATES))
+      constants.DEFAULT_ENABLED_DISK_TEMPLATES)
 
   def GetDefaultDiskTemplate(self):
     """Returns the default disk template to be used.