Revert "org-odt.el (org-odt-styles-dir): Try more directories"

This reverts commit fc8ad1347e103b399d0fcdb617d99e5bf06b80b6.

lisp/org-odt.el

@@ -150,11 +150,7 @@ Also add it to `rng-schema-locating-files'."
   (let* ((d (expand-file-name "../" (org-find-library-dir "org-odt.el")))
 	 (styles-dir-list (list
 			   (concat d "etc/styles/") ;; ELPA and Git
-			   (concat d "etc/org/")    ;; Org from Emacs
-			   (concat d "../"
-				   (number-to-string emacs-major-version) "."
-				   (number-to-string emacs-minor-version) "/etc/org/")
-			   (concat data-directory "org/"))) ;; Custom install
+			   (concat d "etc/org/")))
 	 styles-dir)
     (setq styles-dir
 	  (car
@@ -168,8 +164,8 @@ Also add it to `rng-schema-locating-files'."
 					"OrgOdtStyles.xml" sd)))
 			     sd))
 			 styles-dir-list))))
-    (or (expand-file-name styles-dir)
-	(message "Cannot find factory styles files for Org ODT, aborting")))
+    (or styles-dir
+	(error "Cannot find factory styles files for Org ODT, aborting")))
   "Directory that holds auxiliary XML files used by the ODT exporter.
 
 This directory contains the following XML files -