diff --git a/platform/execution.dashboard/src/splitApi/frontend/FrontendRunDashboardLuxHolder.kt b/platform/execution.dashboard/src/splitApi/frontend/FrontendRunDashboardLuxHolder.kt
index d7e30fd0f2b3..3585af231f27 100644
--- a/platform/execution.dashboard/src/splitApi/frontend/FrontendRunDashboardLuxHolder.kt
+++ b/platform/execution.dashboard/src/splitApi/frontend/FrontendRunDashboardLuxHolder.kt
@@ -9,8 +9,8 @@ import com.intellij.platform.execution.dashboard.splitApi.RunDashboardLuxedConte
 import com.intellij.platform.execution.dashboard.splitApi.RunDashboardServiceRpc
 import com.intellij.platform.project.projectId
 import com.intellij.platform.util.coroutines.childScope
-import fleet.multiplatform.shims.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
+import java.util.concurrent.ConcurrentHashMap
 
 @Service(Service.Level.PROJECT)
 internal class FrontendRunDashboardLuxHolder(val project: Project, val coroutineScope: CoroutineScope) {
diff --git a/platform/kernel/shared/src/ids/BackendGlobalIdsManager.kt b/platform/kernel/shared/src/ids/BackendGlobalIdsManager.kt
index c32c68066128..9c161cdf0004 100644
--- a/platform/kernel/shared/src/ids/BackendGlobalIdsManager.kt
+++ b/platform/kernel/shared/src/ids/BackendGlobalIdsManager.kt
@@ -7,8 +7,8 @@ import com.intellij.platform.rpc.Id
 import com.intellij.platform.rpc.UID
 import com.intellij.util.AwaitCancellationAndInvoke
 import com.intellij.util.awaitCancellationAndInvoke
-import fleet.multiplatform.shims.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
 
 @Service(Service.Level.APP)
diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointTypesManager.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointTypesManager.kt
index f6c9eadd5012..68eba716b320 100644
--- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointTypesManager.kt
+++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointTypesManager.kt
@@ -10,7 +10,6 @@ import com.intellij.platform.debugger.impl.rpc.XBreakpointTypeId
 import com.intellij.platform.project.projectId
 import com.intellij.xdebugger.impl.breakpoints.XBreakpointTypeProxy
 import com.intellij.xdebugger.impl.breakpoints.XLineBreakpointTypeProxy
-import fleet.multiplatform.shims.ConcurrentHashMap
 import fleet.rpc.client.durable
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
@@ -19,6 +18,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import java.util.concurrent.ConcurrentHashMap
 
 
 @Service(Service.Level.PROJECT)
diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/storage/FrontendXStackFramesStorage.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/storage/FrontendXStackFramesStorage.kt
index 134c1cf27585..c393c944a0a3 100644
--- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/storage/FrontendXStackFramesStorage.kt
+++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/storage/FrontendXStackFramesStorage.kt
@@ -5,8 +5,8 @@ import com.intellij.openapi.project.Project
 import com.intellij.platform.debugger.impl.frontend.frame.FrontendXStackFrame
 import com.intellij.platform.debugger.impl.rpc.XStackFrameDto
 import com.intellij.platform.debugger.impl.rpc.XStackFrameId
-import fleet.multiplatform.shims.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
 
diff --git a/platform/xdebugger-impl/frontend/tests/com/intellij/platform/debugger/impl/frontend/tests/FindOrAwaitElementTest.kt b/platform/xdebugger-impl/frontend/tests/com/intellij/platform/debugger/impl/frontend/tests/FindOrAwaitElementTest.kt
index 99d5a1bd29a5..280bdd1a105b 100644
--- a/platform/xdebugger-impl/frontend/tests/com/intellij/platform/debugger/impl/frontend/tests/FindOrAwaitElementTest.kt
+++ b/platform/xdebugger-impl/frontend/tests/com/intellij/platform/debugger/impl/frontend/tests/FindOrAwaitElementTest.kt
@@ -3,7 +3,6 @@ package com.intellij.platform.debugger.impl.frontend.tests
 
 import com.intellij.openapi.util.Ref
 import com.intellij.platform.debugger.impl.frontend.findOrAwaitElement
-import fleet.multiplatform.shims.ConcurrentHashMap
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -12,6 +11,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.yield
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import java.util.concurrent.ConcurrentHashMap
 
 internal class FindOrAwaitElementTest {
   @Test
diff --git a/platform/xdebugger-impl/shared/src/com/intellij/platform/debugger/impl/shared/FrontendDescriptorStateManager.kt b/platform/xdebugger-impl/shared/src/com/intellij/platform/debugger/impl/shared/FrontendDescriptorStateManager.kt
index 944cc554d4b6..81a3d3406527 100644
--- a/platform/xdebugger-impl/shared/src/com/intellij/platform/debugger/impl/shared/FrontendDescriptorStateManager.kt
+++ b/platform/xdebugger-impl/shared/src/com/intellij/platform/debugger/impl/shared/FrontendDescriptorStateManager.kt
@@ -6,10 +6,10 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.project.Project
 import com.intellij.xdebugger.frame.XDescriptor
-import fleet.multiplatform.shims.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.job
 import org.jetbrains.annotations.ApiStatus
+import java.util.concurrent.ConcurrentHashMap
 
 /**
  * Creates a plugin-specific state for a given [XDescriptor].
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XExecutionStackModel.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XExecutionStackModel.kt
index 5cfc303beac6..2785801f7502 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XExecutionStackModel.kt
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XExecutionStackModel.kt
@@ -11,9 +11,9 @@ import com.intellij.util.AwaitCancellationAndInvoke
 import com.intellij.util.awaitCancellationAndInvoke
 import com.intellij.xdebugger.frame.XExecutionStack
 import com.intellij.xdebugger.impl.XDebugSessionImpl
-import fleet.multiplatform.shims.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
 import org.jetbrains.annotations.ApiStatus
+import java.util.concurrent.ConcurrentHashMap
 
 @ConsistentCopyVisibility
 @ApiStatus.Internal
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XSuspendContextModel.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XSuspendContextModel.kt
index 448387828c62..54a6eb0f4d3e 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XSuspendContextModel.kt
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XSuspendContextModel.kt
@@ -11,9 +11,9 @@ import com.intellij.util.AwaitCancellationAndInvoke
 import com.intellij.util.awaitCancellationAndInvoke
 import com.intellij.xdebugger.frame.XSuspendContext
 import com.intellij.xdebugger.impl.XDebugSessionImpl
-import fleet.multiplatform.shims.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
 import org.jetbrains.annotations.ApiStatus
+import java.util.concurrent.ConcurrentHashMap
 
 @ConsistentCopyVisibility
 @ApiStatus.Internal
diff --git a/plugins/git4idea/src/git4idea/branch/GitCompareBranchesFilesManager.kt b/plugins/git4idea/src/git4idea/branch/GitCompareBranchesFilesManager.kt
index 29528d661617..59bf6e93ae42 100644
--- a/plugins/git4idea/src/git4idea/branch/GitCompareBranchesFilesManager.kt
+++ b/plugins/git4idea/src/git4idea/branch/GitCompareBranchesFilesManager.kt
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.vcs.log.VcsLogRangeFilter
 import com.intellij.vcs.log.visible.filters.VcsLogFilterObject
-import fleet.multiplatform.shims.ConcurrentHashMap
+import java.util.concurrent.ConcurrentHashMap
 
 @Service(Service.Level.PROJECT)
 internal class GitCompareBranchesFilesManager(private val project: Project) : Disposable {
diff --git a/plugins/git4idea/src/git4idea/repo/GitConfigurationCache.kt b/plugins/git4idea/src/git4idea/repo/GitConfigurationCache.kt
index 291194043e20..3eed3850cd78 100644
--- a/plugins/git4idea/src/git4idea/repo/GitConfigurationCache.kt
+++ b/plugins/git4idea/src/git4idea/repo/GitConfigurationCache.kt
@@ -12,10 +12,10 @@ import com.intellij.openapi.vcs.VcsException
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import com.intellij.util.messages.MessageBusConnection
-import fleet.multiplatform.shims.ConcurrentHashMap
 import git4idea.config.GitConfigUtil
 import org.jetbrains.annotations.ApiStatus
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.jvm.optionals.getOrNull
 
 @ApiStatus.Experimental
diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryIdCache.kt b/plugins/git4idea/src/git4idea/repo/GitRepositoryIdCache.kt
index 122f7eff03ee..7597a7a2173f 100644
--- a/plugins/git4idea/src/git4idea/repo/GitRepositoryIdCache.kt
+++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryIdCache.kt
@@ -7,12 +7,12 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.platform.vcs.impl.shared.rpc.RepositoryId
-import fleet.multiplatform.shims.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
+import java.util.concurrent.ConcurrentHashMap
 
 @Service(Service.Level.PROJECT)
 internal class GitRepositoryIdCache(private val project: Project, cs: CoroutineScope) {
-  private val cache: MutableMap<RepositoryId, GitRepository?> = ConcurrentHashMap()
+  private val cache: MutableMap<RepositoryId, GitRepository> = ConcurrentHashMap()
 
   init {
     project.messageBus.connect(cs).subscribe<VcsRepositoryMappingListener>(
diff --git a/plugins/terminal/backend/src/com/intellij/terminal/backend/TerminalShellIntegrationStatistics.kt b/plugins/terminal/backend/src/com/intellij/terminal/backend/TerminalShellIntegrationStatistics.kt
index 0e67e5f1e84a..76c8fced8c02 100644
--- a/plugins/terminal/backend/src/com/intellij/terminal/backend/TerminalShellIntegrationStatistics.kt
+++ b/plugins/terminal/backend/src/com/intellij/terminal/backend/TerminalShellIntegrationStatistics.kt
@@ -1,9 +1,9 @@
 package com.intellij.terminal.backend
 
 import com.intellij.openapi.project.Project
-import fleet.multiplatform.shims.ConcurrentHashMap
 import org.jetbrains.plugins.terminal.block.reworked.TerminalShellIntegrationEventsListener
 import org.jetbrains.plugins.terminal.fus.ReworkedTerminalUsageCollector
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.time.Duration.Companion.milliseconds
 
 internal class TerminalShellIntegrationStatisticsListener(private val project: Project) : TerminalShellIntegrationEventsListener {