diff --git a/lib/build/rpc_definitions.py b/lib/build/rpc_definitions.py
index 65e38eaf384008b77d62693f551cb1dfe7033a9b..b1a0eed24053308b4d5a45856edf096c5e20271a 100644
--- a/lib/build/rpc_definitions.py
+++ b/lib/build/rpc_definitions.py
@@ -342,5 +342,5 @@ _MISC_CALLS = [
   ]
 
 CALLS = {
-  "RpcClientDefault": _IMPEXP_CALLS,
+  "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS),
   }
diff --git a/lib/rpc.py b/lib/rpc.py
index e1f0f08054d32824d67b10452140b139cbffb357..4f8fa4ef98199c2c0289c5a07231a7c7f35e19cd 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1518,30 +1518,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault):
     return self._MultiNodeCall(node_list, "hypervisor_validate_params",
                                [hvname, hv_full])
 
-  @_RpcTimeout(_TMO_NORMAL)
-  def call_x509_cert_create(self, node, validity):
-    """Creates a new X509 certificate for SSL/TLS.
-
-    This is a single-node call.
-
-    @type validity: int
-    @param validity: Validity in seconds
-
-    """
-    return self._SingleNodeCall(node, "x509_cert_create", [validity])
-
-  @_RpcTimeout(_TMO_NORMAL)
-  def call_x509_cert_remove(self, node, name):
-    """Removes a X509 certificate.
-
-    This is a single-node call.
-
-    @type name: string
-    @param name: Certificate name
-
-    """
-    return self._SingleNodeCall(node, "x509_cert_remove", [name])
-
   @_RpcTimeout(_TMO_NORMAL)
   def call_import_start(self, node, opts, instance, component,
                         dest, dest_args):