diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 469c738b0f..bd0be28427 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -321,9 +321,6 @@ int main(int argc, char **argv)
         goto end;
      }
 
-   if (!getenv("EFL_RUN_IN_TREE"))
-     eolian_system_directory_scan();
-
    eolian_all_eot_files_parse();
 
    const char *filename;
diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc
index 3e54ed3f13..93064bc7ae 100644
--- a/src/bin/eolian_cxx/eolian_cxx.cc
+++ b/src/bin/eolian_cxx/eolian_cxx.cc
@@ -197,10 +197,6 @@ database_load(options_type const& opts)
                << "Couldn't load eolian from '" << src << "'.";
           }
      }
-   if (!getenv("EFL_RUN_IN_TREE"))
-     {
-        eolian_system_directory_scan();
-     }
    if (!::eolian_all_eot_files_parse())
      {
         EINA_CXX_DOM_LOG_ERR(eolian_cxx::domain)