diff --git a/daemons/ganeti-rapi b/daemons/ganeti-rapi
index 5d3d01b36b69d6460d4603651cdd685ee42b2771..c22b6673ae54556f5e7c0cfcddfb264007c9072a 100755
--- a/daemons/ganeti-rapi
+++ b/daemons/ganeti-rapi
@@ -50,7 +50,7 @@ class RemoteApiHttpServer(http.HttpServer):
 
     """
     (HandlerClass, items, args) = self._resmap.getController(req.request_path)
-    handler = HandlerClass(items, args, req.request_post_data)
+    handler = HandlerClass(items, args, req)
 
     method = req.request_method.upper()
     try:
diff --git a/lib/rapi/baserlib.py b/lib/rapi/baserlib.py
index 872b71a6eb6e0abe6ade623f95b5871e30cca039..e6ed7d099cac82a9c5fd8f3587614a24b22dd10d 100644
--- a/lib/rapi/baserlib.py
+++ b/lib/rapi/baserlib.py
@@ -126,7 +126,7 @@ class R_Generic(object):
   """Generic class for resources.
 
   """
-  def __init__(self, items, queryargs, post_data):
+  def __init__(self, items, queryargs, req):
     """Generic resource constructor.
 
     Args:
@@ -136,7 +136,7 @@ class R_Generic(object):
     """
     self.items = items
     self.queryargs = queryargs
-    self.post_data = post_data
+    self.req = req
     self.sn = None
 
   def getSerialNumber(self):