diff --git a/lib/build/rpc_definitions.py b/lib/build/rpc_definitions.py
index b1a0eed24053308b4d5a45856edf096c5e20271a..e93cc787dd479343745e7a236f645dc24067a9eb 100644
--- a/lib/build/rpc_definitions.py
+++ b/lib/build/rpc_definitions.py
@@ -342,5 +342,5 @@ _MISC_CALLS = [
   ]
 
 CALLS = {
-  "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS),
+  "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS + _OS_CALLS),
   }
diff --git a/lib/rpc.py b/lib/rpc.py
index 4f8fa4ef98199c2c0289c5a07231a7c7f35e19cd..2fcb1b9558740bb76d44fbfdd3ba86381291c9b3 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1295,37 +1295,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault):
     return self._SingleNodeCall(node, "run_oob", [oob_program, command,
                                                   remote_node, timeout])
 
-  @_RpcTimeout(_TMO_FAST)
-  def call_os_diagnose(self, node_list):
-    """Request a diagnose of OS definitions.
-
-    This is a multi-node call.
-
-    """
-    return self._MultiNodeCall(node_list, "os_diagnose", [])
-
-  @_RpcTimeout(_TMO_FAST)
-  def call_os_get(self, node, name):
-    """Returns an OS definition.
-
-    This is a single-node call.
-
-    """
-    result = self._SingleNodeCall(node, "os_get", [name])
-    if not result.fail_msg and isinstance(result.payload, dict):
-      result.payload = objects.OS.FromDict(result.payload)
-    return result
-
-  @_RpcTimeout(_TMO_FAST)
-  def call_os_validate(self, nodes, required, name, checks, params):
-    """Run a validation routine for a given OS.
-
-    This is a multi-node call.
-
-    """
-    return self._MultiNodeCall(nodes, "os_validate",
-                               [required, name, checks, params])
-
   @_RpcTimeout(_TMO_NORMAL)
   def call_hooks_runner(self, node_list, hpath, phase, env):
     """Call the hooks runner.