diff --git a/platform/vcs-impl/resources/META-INF/VcsExtensions.xml b/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
index 66d0f1553fc9..e2d81aa2695e 100644
--- a/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
+++ b/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
@@ -137,7 +137,6 @@
     <vcs.commitMessageInspection implementation="com.intellij.vcs.commit.message.SubjectBodySeparationInspection"/>
     <vcs.commitMessageInspection implementation="com.intellij.vcs.commit.message.SubjectLimitInspection"/>
     <vcs.commitMessageInspection implementation="com.intellij.vcs.commit.message.BodyLimitInspection"/>
-    <vcs.commitMessageInspection implementation="com.intellij.vcs.commit.message.CommitMessageSpellCheckingInspection"/>
 
     <referenceProviderType key="commentsReferenceProvider"
                            implementationClass="com.intellij.psi.impl.source.resolve.reference.ArbitraryPlaceUrlReferenceProvider"/>
diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/message/CommitMessageSpellCheckingInspection.java b/platform/vcs-impl/src/com/intellij/vcs/commit/message/CommitMessageSpellCheckingInspection.java
deleted file mode 100644
index 30d14f2ae997..000000000000
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/message/CommitMessageSpellCheckingInspection.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.vcs.commit.message;
-
-import com.intellij.codeHighlighting.HighlightDisplayLevel;
-import com.intellij.codeInspection.LocalInspectionTool;
-import com.intellij.codeInspection.LocalInspectionToolSession;
-import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.codeInspection.ex.InspectionToolRegistrar;
-import com.intellij.codeInspection.ex.InspectionToolWrapper;
-import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.NullableLazyValue;
-import com.intellij.openapi.vcs.VcsBundle;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.util.ObjectUtils;
-import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-import static com.intellij.openapi.util.NullableLazyValue.atomicLazyNullable;
-
-@ApiStatus.Internal
-public final class CommitMessageSpellCheckingInspection extends BaseCommitMessageInspection {
-  private static final Logger LOG = Logger.getInstance(CommitMessageSpellCheckingInspection.class);
-
-  private static final NullableLazyValue<LocalInspectionTool> ourSpellCheckingInspection = atomicLazyNullable(() -> {
-    List<InspectionToolWrapper<?, ?>> tools = InspectionToolRegistrar.getInstance().createTools();
-    InspectionToolWrapper<?, ?> spellCheckingWrapper = ContainerUtil.find(tools, wrapper -> wrapper.getShortName().equals("SpellCheckingInspection"));
-    if (spellCheckingWrapper == null) {
-      LOG.info("Could not find default spell checking inspection");
-    }
-    else if (!(spellCheckingWrapper instanceof LocalInspectionToolWrapper)) {
-      LOG.info("Found spell checking wrapper is not local " + spellCheckingWrapper);
-    }
-    else {
-      return ((LocalInspectionToolWrapper)spellCheckingWrapper).getTool();
-    }
-    return null;
-  });
-
-  @Override
-  public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder,
-                                                 boolean isOnTheFly,
-                                                 @NotNull LocalInspectionToolSession session) {
-    LocalInspectionTool tool = ourSpellCheckingInspection.getValue();
-
-    return tool != null ? tool.buildVisitor(holder, isOnTheFly, session) : super.buildVisitor(holder, isOnTheFly, session);
-  }
-
-  @Override
-  public @Nls @NotNull String getDisplayName() {
-    return VcsBundle.message("inspection.CommitMessageSpellCheckingInspection.display.name");
-  }
-
-  @Override
-  public @NotNull HighlightDisplayLevel getDefaultLevel() {
-    return ObjectUtils.notNull(HighlightDisplayLevel.find("TYPO"), HighlightDisplayLevel.WARNING);
-  }
-
-  @Override
-  public boolean isEnabledByDefault() {
-    return true;
-  }
-}
diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/spellcheck/GrazieSpellCheckingInspection.java b/plugins/grazie/src/main/kotlin/com/intellij/grazie/spellcheck/GrazieSpellCheckingInspection.java
index 497584cb5311..c5f7b666d9d7 100644
--- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/spellcheck/GrazieSpellCheckingInspection.java
+++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/spellcheck/GrazieSpellCheckingInspection.java
@@ -18,6 +18,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vcs.ui.CommitMessage;
 import com.intellij.profile.codeInspection.InspectionProfileManager;
 import com.intellij.psi.*;
 import com.intellij.psi.util.CachedValuesManager;
@@ -101,7 +102,7 @@ public final class GrazieSpellCheckingInspection extends SpellCheckingInspection
   public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder,
                                                  boolean isOnTheFly,
                                                  @NotNull LocalInspectionToolSession session) {
-    if (!Registry.is("spellchecker.inspection.enabled", true) ||
+    if (CommitMessage.isCommitMessage(session.getFile()) ||
         InspectionProfileManager.hasTooLowSeverity(session, this) ||
         InjectedLanguageManager.getInstance(holder.getProject()).isFrankensteinInjection(holder.getFile())) {
       return PsiElementVisitor.EMPTY_VISITOR;
diff --git a/spellchecker/resources/intellij.spellchecker.xml b/spellchecker/resources/intellij.spellchecker.xml
index 225070ad6d28..e19a7f7d8aeb 100644
--- a/spellchecker/resources/intellij.spellchecker.xml
+++ b/spellchecker/resources/intellij.spellchecker.xml
@@ -33,7 +33,6 @@
     <spellchecker.dictionaryLayersProvider implementation="com.intellij.spellchecker.PlatformSettingsDictionaryLayersProvider" order="first"/>
 
     <registryKey key="spellchecker.corrections.limit" defaultValue="3" description="Spellchecker corrections limit" restartRequired="false"/>
-    <registryKey key="spellchecker.inspection.enabled" defaultValue="true" description="Enable spellchecking inspection" restartRequired="false"/>
     <registryKey key="spellchecker.use.standard.project.dictionary.name" defaultValue="true" description="Enables single project dictionary file"
                  restartRequired="false"/>