diff --git a/python/pluginSrc/com/jetbrains/python/PythonFileTypeFactory.java b/python/pluginSrc/com/jetbrains/python/PythonFileTypeFactory.java
deleted file mode 100644
index 0075ce121406..000000000000
--- a/python/pluginSrc/com/jetbrains/python/PythonFileTypeFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jetbrains.python;
-
-import com.intellij.ide.highlighter.XmlFileType;
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
-import com.intellij.ultimate.PluginVerifier;
-import com.intellij.ultimate.UltimateVerifier;
-import com.jetbrains.pyqt.QtUIFileType;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Plugin version of file type factory - uses UltimateVerifier.
- *
- * @author yole
- */
-public class PythonFileTypeFactory extends FileTypeFactory {
-  public PythonFileTypeFactory(UltimateVerifier verifier) {
-    PluginVerifier.verifyUltimatePlugin(verifier);
-  }
-
-  public void createFileTypes(@NonNls @NotNull final FileTypeConsumer consumer) {
-    consumer.consume(PythonFileType.INSTANCE, "py;pyw;");
-    consumer.consume(QtUIFileType.INSTANCE, "ui");
-    consumer.consume(XmlFileType.INSTANCE, "qrc");
-  }
-}
diff --git a/python/python-community.iml b/python/python-community.iml
index a3b4304fdda2..8c87db855838 100644
--- a/python/python-community.iml
+++ b/python/python-community.iml
@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="smRunner" />
     <orderEntry type="module" module-name="spellchecker" />
     <orderEntry type="module" module-name="xdebugger-impl" />
+    <orderEntry type="module" module-name="xml-psi-impl" />
   </component>
 </module>
 
diff --git a/python/ide/src/com/jetbrains/python/PythonFileTypeFactory.java b/python/src/com/jetbrains/python/PythonFileTypeFactory.java
similarity index 89%
rename from python/ide/src/com/jetbrains/python/PythonFileTypeFactory.java
rename to python/src/com/jetbrains/python/PythonFileTypeFactory.java
index 25a2ecc42ad4..937a006ded6e 100644
--- a/python/ide/src/com/jetbrains/python/PythonFileTypeFactory.java
+++ b/python/src/com/jetbrains/python/PythonFileTypeFactory.java
@@ -8,8 +8,6 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * IDE version of file type factory - does not use UltimateVerifier.
- * 
  * @author yole
  */
 public class PythonFileTypeFactory extends FileTypeFactory {