diff --git a/lib/build/rpc_definitions.py b/lib/build/rpc_definitions.py
index 52fb4fb022fa95162ae398b874e1eba4ac8a5d73..f764ae98e4014eff0edf323b311500ec261211e5 100644
--- a/lib/build/rpc_definitions.py
+++ b/lib/build/rpc_definitions.py
@@ -342,5 +342,6 @@ _MISC_CALLS = [
   ]
 
 CALLS = {
-  "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS + _OS_CALLS + _NODE_CALLS),
+  "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS + _OS_CALLS + _NODE_CALLS +
+    _FILE_STORAGE_CALLS),
   }
diff --git a/lib/rpc.py b/lib/rpc.py
index 792a78b5f3993b401152685022df3f0fbcf0492c..855e1fb971b17eff2c02890de507331894a8dae0 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1336,37 +1336,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault):
     return self._MultiNodeCall(node_list, "test_delay", [duration],
                                read_timeout=int(duration + 5))
 
-  @_RpcTimeout(_TMO_FAST)
-  def call_file_storage_dir_create(self, node, file_storage_dir):
-    """Create the given file storage directory.
-
-    This is a single-node call.
-
-    """
-    return self._SingleNodeCall(node, "file_storage_dir_create",
-                                [file_storage_dir])
-
-  @_RpcTimeout(_TMO_FAST)
-  def call_file_storage_dir_remove(self, node, file_storage_dir):
-    """Remove the given file storage directory.
-
-    This is a single-node call.
-
-    """
-    return self._SingleNodeCall(node, "file_storage_dir_remove",
-                                [file_storage_dir])
-
-  @_RpcTimeout(_TMO_FAST)
-  def call_file_storage_dir_rename(self, node, old_file_storage_dir,
-                                   new_file_storage_dir):
-    """Rename file storage directory.
-
-    This is a single-node call.
-
-    """
-    return self._SingleNodeCall(node, "file_storage_dir_rename",
-                                [old_file_storage_dir, new_file_storage_dir])
-
   @classmethod
   @_RpcTimeout(_TMO_URGENT)
   def call_jobqueue_update(cls, node_list, address_list, file_name, content):