diff --git a/RegExpSupport/resources/META-INF/RegExpPlugin.xml b/RegExpSupport/resources/META-INF/RegExpPlugin.xml
index eb7ef09a7bb4..beb81686cfde 100644
--- a/RegExpSupport/resources/META-INF/RegExpPlugin.xml
+++ b/RegExpSupport/resources/META-INF/RegExpPlugin.xml
@@ -20,7 +20,7 @@
   <extensions defaultExtensionNs="com.intellij">
     <lang.documentationProvider language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpDocumentationProvider"/>
     <completion.contributor language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpCompletionContributor"/>
-    <fileTypeFactory implementation="org.intellij.lang.regexp.RegExpSupportLoader" />
+    <fileType name="RegExp" implementationClass="org.intellij.lang.regexp.RegExpFileType" extensions="regexp" fieldName="INSTANCE" language="RegExp"/>
     <annotator language="RegExp" implementationClass="org.intellij.lang.regexp.validation.RegExpAnnotator"/>
     <lang.parserDefinition language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpParserDefinition"/>
     <lang.syntaxHighlighterFactory language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpSyntaxHighlighterFactory"/>
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpSupportLoader.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpSupportLoader.java
deleted file mode 100644
index 4a9964dc7c6c..000000000000
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpSupportLoader.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2006 Sascha Weinreuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.intellij.lang.regexp;
-
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
-import org.jetbrains.annotations.NotNull;
-
-public class RegExpSupportLoader extends FileTypeFactory {
-    public static final RegExpLanguage LANGUAGE = RegExpLanguage.INSTANCE;
-    public static final RegExpFileType FILE_TYPE = RegExpFileType.INSTANCE;
-
-    @Override
-    public void createFileTypes(final @NotNull FileTypeConsumer consumer) {
-        consumer.consume(FILE_TYPE, FILE_TYPE.getDefaultExtension());
-    }
-}