diff --git a/app/flatpak-builtins-list.c b/app/flatpak-builtins-list.c
index 6a348048..43f9e4cb 100644
--- a/app/flatpak-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@@ -91,8 +91,7 @@ print_installed_refs (gboolean app, gboolean runtime, gboolean print_system, gbo
 
   if (print_user)
     {
-      user_dir = flatpak_dir_get (TRUE);
-
+      user_dir = flatpak_dir_get_user ();
       if (flatpak_dir_ensure_repo (user_dir, cancellable, NULL))
         {
           if (app && !flatpak_dir_list_refs (user_dir, "app", &user_app, cancellable, error))
@@ -104,7 +103,7 @@ print_installed_refs (gboolean app, gboolean runtime, gboolean print_system, gbo
 
   if (print_system)
     {
-      system_dir = flatpak_dir_get (FALSE);
+      system_dir = flatpak_dir_get_system_default ();
       if (flatpak_dir_ensure_repo (system_dir, cancellable, NULL))
         {
           if (app && !flatpak_dir_list_refs (system_dir, "app", &system_app, cancellable, error))
diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index da011794..2dcdaa9c 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -236,7 +236,7 @@ flatpak_option_context_parse (GOptionContext     *context,
 
   if (!(flags & FLATPAK_BUILTIN_FLAG_NO_DIR))
     {
-      dir = flatpak_dir_get (opt_user);
+      dir = opt_user ? flatpak_dir_get_user () : flatpak_dir_get_system_default ();
 
       if (!flatpak_dir_ensure_path (dir, cancellable, error))
         return FALSE;
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index e9366ca6..76f260c1 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -484,7 +484,7 @@ flatpak_load_override_keyfile (const char *app_id, gboolean user, GError **error
   g_autoptr(GKeyFile) metakey = g_key_file_new ();
   g_autoptr(FlatpakDir) dir = NULL;
 
-  dir = flatpak_dir_get (user);
+  dir = user ? flatpak_dir_get_user () : flatpak_dir_get_system_default ();
 
   metadata_contents = flatpak_dir_load_override (dir, app_id, &metadata_size, error);
   if (metadata_contents == NULL)
@@ -5684,15 +5684,6 @@ flatpak_dir_get_user (void)
   return flatpak_dir_new (path, TRUE);
 }
 
-FlatpakDir *
-flatpak_dir_get (gboolean user)
-{
-  if (user)
-    return flatpak_dir_get_user ();
-  else
-    return flatpak_dir_get_system_default ();
-}
-
 static char *
 get_group (const char *remote_name)
 {
diff --git a/common/flatpak-dir.h b/common/flatpak-dir.h
index 4c7ae305..0add0319 100644
--- a/common/flatpak-dir.h
+++ b/common/flatpak-dir.h
@@ -142,7 +142,6 @@ GKeyFile *     flatpak_deploy_get_metadata (FlatpakDeploy *deploy);
 FlatpakDir *  flatpak_dir_new (GFile   *basedir,
                                gboolean user);
 FlatpakDir *  flatpak_dir_clone (FlatpakDir *self);
-FlatpakDir  *flatpak_dir_get (gboolean user);
 FlatpakDir  *flatpak_dir_get_system_default (void);
 FlatpakDir  *flatpak_dir_get_user (void);
 gboolean    flatpak_dir_is_user (FlatpakDir *self);