diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index b8f711b21..cd1e0e26e 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -181,12 +181,15 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     std::string local(variables["data-local"].as<std::string>());
     if (!local.empty())
     {
-        dataDirs.push_back(Files::PathContainer::value_type(local));
+        std::cout << "Ignoring data-local (currently not supported)" << std::endl;
+//        dataDirs.push_back(Files::PathContainer::value_type(local));
     }
 
-    if (dataDirs.empty())
+    if (dataDirs.size()>1)
     {
-        dataDirs.push_back(cfgMgr.getLocalPath());
+        dataDirs.resize (1);
+        std::cout << "Ignoring all but the first data path (multiple data paths currently not supported)"
+            << std::endl;
     }
 
     cfgMgr.processPaths(dataDirs);
diff --git a/files/openmw.cfg b/files/openmw.cfg
index 585b735f3..0af096e6a 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -1,5 +1,2 @@
 data="?mw?Data Files"
-data="?global?data"
-data="?local?data"
-data-local="?user?data"
 resources=${MORROWIND_RESOURCE_FILES}