diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/JavaReformatOnTypingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/JavaReformatOnTypingTest.java
index 49fae5fe172f..c759a801d748 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/JavaReformatOnTypingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/JavaReformatOnTypingTest.java
@@ -105,8 +105,8 @@ public class JavaReformatOnTypingTest extends LightPlatformCodeInsightFixtureTes
     doTest("class X { char x = '<caret>'; }", "=", "class X { char x = '='; }");
   }
   
-  public void test_AfterOpenedBracket() {
-    doTest("class X { char x = '<caret> }", "='", "class X { char x = '=' }");
+  public void test_AfterOpenedQuote() {
+    doTest("class X { char x = '<caret> }", "=", "class X { char x = '= }");
   }
   
   public void test_DistinguishAssignmentAndEquality() {
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 35a13d58eec3..9ba616080ea8 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -727,7 +727,6 @@
                          order="before hide-hints"/>
 
     <editorTypedHandler implementationClass="com.intellij.codeInsight.lookup.impl.LookupTypedHandler" id="lookup"/>
-    <editorTypedHandler implementationClass="com.intellij.codeInsight.editorActions.AutoFormatTypedHandler"/>
     <typedHandler implementation="com.intellij.codeInsight.editorActions.CompletionAutoPopupHandler" id="completionAutoPopup"
                   order="first"/>
     <typedHandler implementation="com.intellij.codeInsight.editorActions.SelectionQuotingTypedHandler" id="selectionQuoting"/>