diff --git a/lib/objects.py b/lib/objects.py
index b8d67eae4fdd3a78c4b890e72b3e326aef9b0df8..e70945d1e7e6490d688b508360327877f055fec0 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -1894,17 +1894,6 @@ class _QueryResponseBase(ConfigObject):
     return obj
 
 
-class QueryRequest(ConfigObject):
-  """Object holding a query request.
-
-  """
-  __slots__ = [
-    "what",
-    "fields",
-    "qfilter",
-    ]
-
-
 class QueryResponse(_QueryResponseBase):
   """Object holding the response to a query.
 
diff --git a/lib/server/masterd.py b/lib/server/masterd.py
index e7c1247d9d9d81142098c2593dcb7d2526e86643..4284e718e3aa381143420126237c386278a763b8 100644
--- a/lib/server/masterd.py
+++ b/lib/server/masterd.py
@@ -302,21 +302,20 @@ class ClientOps:
 
     elif method == luxi.REQ_QUERY:
       (what, fields, qfilter) = args
-      req = objects.QueryRequest(what=what, fields=fields, qfilter=qfilter)
 
-      if req.what in constants.QR_VIA_OP:
-        result = self._Query(opcodes.OpQuery(what=req.what, fields=req.fields,
-                                             qfilter=req.qfilter))
-      elif req.what == constants.QR_LOCK:
-        if req.qfilter is not None:
+      if what in constants.QR_VIA_OP:
+        result = self._Query(opcodes.OpQuery(what=what, fields=fields,
+                                             qfilter=qfilter))
+      elif what == constants.QR_LOCK:
+        if qfilter is not None:
           raise errors.OpPrereqError("Lock queries can't be filtered")
-        return context.glm.QueryLocks(req.fields)
-      elif req.what == constants.QR_JOB:
-        return queue.QueryJobs(req.fields, req.qfilter)
-      elif req.what in constants.QR_VIA_LUXI:
+        return context.glm.QueryLocks(fields)
+      elif what == constants.QR_JOB:
+        return queue.QueryJobs(fields, qfilter)
+      elif what in constants.QR_VIA_LUXI:
         raise NotImplementedError
       else:
-        raise errors.OpPrereqError("Resource type '%s' unknown" % req.what,
+        raise errors.OpPrereqError("Resource type '%s' unknown" % what,
                                    errors.ECODE_INVAL)
 
       return result