diff --git a/platform/core-api/src/com/intellij/openapi/components/ComponentManager.java b/platform/core-api/src/com/intellij/openapi/components/ComponentManager.java
index 41efa1d75e1e..0462e953222e 100644
--- a/platform/core-api/src/com/intellij/openapi/components/ComponentManager.java
+++ b/platform/core-api/src/com/intellij/openapi/components/ComponentManager.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.util.messages.MessageBus;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.picocontainer.PicoContainer;
 
 /**
@@ -49,7 +48,6 @@ public interface ComponentManager extends UserDataHolder, Disposable {
    * @param interfaceClass the interface class of the component
    * @return component that matches interface class or null if there is no such component
    */
-  @Nullable
   <T> T getComponent(@NotNull Class<T> interfaceClass);
 
   /**
diff --git a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
index 4c1e83531161..e6f22edb527a 100644
--- a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
@@ -162,7 +162,6 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
     myComponentConfigCount = -1;
   }
 
-  @Nullable
   @SuppressWarnings("unchecked")
   @Override
   public final <T> T getComponent(@NotNull Class<T> interfaceClass) {