diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index fa254326a8e6417fa7dd78e904a692d7b05bc8e4..366e646bf06148d2532a05fa68dfd143fa9777c6 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1468,6 +1468,7 @@ class LUQueryClusterInfo(NoHooksLU):
 
   """
   _OP_REQP = []
+  REQ_MASTER = False
 
   def CheckPrereq(self):
     """No prerequsites needed for this LU.
@@ -1479,8 +1480,6 @@ class LUQueryClusterInfo(NoHooksLU):
     """Return cluster config.
 
     """
-    instances = [self.cfg.GetInstanceInfo(name)
-                 for name in self.cfg.GetInstanceList()]
     result = {
       "name": self.sstore.GetClusterName(),
       "software_version": constants.RELEASE_VERSION,
@@ -1490,9 +1489,6 @@ class LUQueryClusterInfo(NoHooksLU):
       "export_version": constants.EXPORT_VERSION,
       "master": self.sstore.GetMasterNode(),
       "architecture": (platform.architecture()[0], platform.machine()),
-      "instances": [(instance.name, instance.primary_node)
-                    for instance in instances],
-      "nodes": self.cfg.GetNodeList(),
       }
 
     return result
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 3fd271cef0b1c12363bb132b283297b8076953ff..6c9a970bbdb9117835b0c62ef9b50533569c8a09 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -102,17 +102,10 @@ def ShowClusterConfig(opts, args):
 
   print ("Cluster name: %s" % result["name"])
 
-  print ("Architecture: %s (%s)" %
-            (result["architecture"][0], result["architecture"][1]))
-
   print ("Master node: %s" % result["master"])
 
-  print ("Instances:")
-  for name, node in result["instances"]:
-    print ("  - %s (on %s)" % (name, node))
-  print ("Nodes:")
-  for name in result["nodes"]:
-    print ("  - %s" % name)
+  print ("Architecture (this node): %s (%s)" %
+         (result["architecture"][0], result["architecture"][1]))
 
   return 0