diff --git a/plugins/built-in-help/intellij.builtInHelp.iml b/plugins/built-in-help/intellij.builtInHelp.iml
index 93267977c41d..de0605e274ba 100644
--- a/plugins/built-in-help/intellij.builtInHelp.iml
+++ b/plugins/built-in-help/intellij.builtInHelp.iml
@@ -19,7 +19,6 @@
     <orderEntry type="library" name="lucene-highlighter" level="project" />
     <orderEntry type="library" name="lucene-queryparser" level="project" />
     <orderEntry type="library" name="lucene-suggest" level="project" />
-    <orderEntry type="library" name="commons-compress" level="project" />
     <orderEntry type="library" name="jsoup" level="project" />
     <orderEntry type="library" name="jaxb-api" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
@@ -34,6 +33,5 @@
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="jackson-databind" level="project" />
     <orderEntry type="library" name="jackson-module-kotlin" level="project" />
-    <orderEntry type="module" module-name="intellij.maven.server.indexer" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/built-in-help/src/com/jetbrains/builtInHelp/HelpRequestHandlerBase.kt b/plugins/built-in-help/src/com/jetbrains/builtInHelp/HelpRequestHandlerBase.kt
index 69741367a5ac..c4cf0cef2424 100644
--- a/plugins/built-in-help/src/com/jetbrains/builtInHelp/HelpRequestHandlerBase.kt
+++ b/plugins/built-in-help/src/com/jetbrains/builtInHelp/HelpRequestHandlerBase.kt
@@ -6,9 +6,11 @@ import io.netty.channel.Channel
 import io.netty.handler.codec.http.FullHttpRequest
 import io.netty.handler.codec.http.HttpHeaders
 import io.netty.handler.codec.http.HttpRequest
-import org.apache.commons.compress.utils.FileNameUtils
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.ide.HttpRequestHandler
+import kotlin.io.path.Path
+import kotlin.io.path.extension
+import kotlin.io.path.nameWithoutExtension
 
 /**
  * Created by Egor.Malyshev on 7/13/2017.
@@ -26,14 +28,15 @@ abstract class HelpRequestHandlerBase : HttpRequestHandler() {
     resourceLocation: String,
     request: FullHttpRequest,
     channel: Channel,
-    extraHeaders: HttpHeaders
+    extraHeaders: HttpHeaders,
   ): Boolean {
 
     val isImage = resourceLocation.contains("/img/")
     val retrieveName = when (isImage) {
       true -> {
-        val baseName = FileNameUtils.getBaseName(resourceName)
-        """${baseName.substringBeforeLast("_dark")}.${FileNameUtils.getExtension(resourceName)}"""
+        val base = Path(resourceName)
+        val baseName = base.nameWithoutExtension
+        """${baseName.substringBeforeLast("_dark")}.${base.extension}"""
       }
       else -> resourceName
     }