diff --git a/core_info.c b/core_info.c
index f0f209589a..486b7ecc86 100644
--- a/core_info.c
+++ b/core_info.c
@@ -265,8 +265,8 @@ static core_info_list_t *core_info_list_new(void)
    if (!core_info)
       goto error;
 
-   core_info_list->list  = core_info;
-   core_info_list->count = 0;
+   core_info_list->list = core_info;
+   core_info_list->count = contents->size;
 
    for (i = 0; i < contents->size; i++)
    {
@@ -340,13 +340,6 @@ static core_info_list_t *core_info_list_new(void)
             strdup(path_basename(core_info[i].path));
    }
 
-   for (i = 0; i < contents->size; i++)
-   {
-      config_file_t *conf = (config_file_t*)
-         core_info_list->list[i].config_data;
-      core_info_list->count += !!conf;
-   }
-
    core_info_list_resolve_all_extensions(core_info_list);
    core_info_list_resolve_all_firmware(core_info_list);