diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index 53c71f63b0d43574d9f23a4d6ac5288605ae09dc..b13bb93f29ecf335042df520932b212fad3a7d91 100755
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -53,7 +53,6 @@ from ganeti import ssconf
 from ganeti import workerpool
 from ganeti import rpc
 from ganeti import bootstrap
-from ganeti import serializer
 
 
 CLIENT_REQUEST_WORKERS = 16
diff --git a/lib/rapi/baserlib.py b/lib/rapi/baserlib.py
index 33a6f0d85286e8cb719dff6f105144580a9de47d..25dae639efbadcd8d9df85e1d7230f6237869614 100644
--- a/lib/rapi/baserlib.py
+++ b/lib/rapi/baserlib.py
@@ -234,7 +234,13 @@ class R_Generic(object):
     self.queryargs = queryargs
     self._req = req
 
-  request_body = property(fget=lambda self: self._req.private.body_data)
+  def _GetRequestBody(self):
+    """Returns the body data.
+
+    """
+    return self._req.private.body_data
+
+  request_body = property(fget=_GetRequestBody)
 
   def _checkIntVariable(self, name, default=0):
     """Return the parsed value of an int argument.