diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
index 6e66d345b1f..473c0429910 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
@@ -24,18 +24,15 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.util.PsiTreeUtil
 import com.sun.jdi.AbsentInformationException
 import com.sun.jdi.ReferenceType
-import org.jetbrains.kotlin.codegen.binding.CodegenBinding.*
-import org.jetbrains.kotlin.codegen.coroutines.containsNonTailSuspensionCalls
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass
 import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider
 import org.jetbrains.kotlin.fileClasses.getFileClassInternalName
 import org.jetbrains.kotlin.idea.debugger.breakpoints.getLambdasAtLineIfAny
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches
-import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.ComputedClassNames
-import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.ComputedClassNames.Companion.EMPTY
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.Companion.getOrComputeClassNames
+import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.ComputedClassNames
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.ComputedClassNames.Companion.Cached
+import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.ComputedClassNames.Companion.EMPTY
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.ComputedClassNames.Companion.NonCached
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -187,12 +184,11 @@ class DebuggerClassNameProvider(
             }
             is KtNamedFunction -> {
                 val typeMapper = KotlinDebuggerCaches.getOrCreateTypeMapper(element)
-                val descriptor = typeMapper.bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element)
 
                 val classNamesOfContainingDeclaration = getOuterClassNamesForElement(element.relevantParentInReadAction)
 
                 val nonInlineClasses: ComputedClassNames
-                if (runReadAction { element.name == null || element.isLocal } || isFunctionWithSuspendStateMachine(descriptor, typeMapper.bindingContext)) {
+                if (runReadAction { element.name == null || element.isLocal }) {
                     nonInlineClasses = classNamesOfContainingDeclaration + ComputedClassNames.Cached(
                             asmTypeForAnonymousClass(typeMapper.bindingContext, element).internalName.toJdiName())
                 }
@@ -246,10 +242,6 @@ class DebuggerClassNameProvider(
         return type.className
     }
 
-    private fun isFunctionWithSuspendStateMachine(descriptor: DeclarationDescriptor?, bindingContext: BindingContext): Boolean {
-        return descriptor is SimpleFunctionDescriptor && descriptor.isSuspend && descriptor.containsNonTailSuspensionCalls(bindingContext)
-    }
-
     private val KtDeclaration.isInlineInReadAction: Boolean
         get() = runReadAction { hasModifier(KtTokens.INLINE_KEYWORD) }
 
@@ -305,4 +297,4 @@ private fun DebugProcess.findTargetClasses(outerClass: ReferenceType, lineAt: In
     catch (_: AbsentInformationException) {}
 
     return targetClasses
-}
\ No newline at end of file
+}
diff --git a/idea/testData/debugger/tinyApp/outs/siSuspendFun.out b/idea/testData/debugger/tinyApp/outs/siSuspendFun.out
index bc00109bdbd..231354b0bb2 100644
--- a/idea/testData/debugger/tinyApp/outs/siSuspendFun.out
+++ b/idea/testData/debugger/tinyApp/outs/siSuspendFun.out
@@ -2,10 +2,8 @@ LineBreakpoint created at siSuspendFun.kt:29
 Run Java
 Connected to the target VM
 siSuspendFun.kt:29
-siSuspendFun.kt:21
 siSuspendFun.kt:22
 siSuspendFun.kt:18
-siSuspendFun.kt:18
 siSuspendFun.kt:14
 siSuspendFun.kt:10
 siSuspendFun.kt:6
diff --git a/idea/testData/debugger/tinyApp/outs/souSuspendFun.out b/idea/testData/debugger/tinyApp/outs/souSuspendFun.out
index 8fa89777e34..246f6af23aa 100644
--- a/idea/testData/debugger/tinyApp/outs/souSuspendFun.out
+++ b/idea/testData/debugger/tinyApp/outs/souSuspendFun.out
@@ -5,9 +5,7 @@ souSuspendFun.kt:7
 souSuspendFun.kt:11
 souSuspendFun.kt:15
 souSuspendFun.kt:19
-souSuspendFun.kt:19
 souSuspendFun.kt:23
-souSuspendFun.kt:25
 souSuspendFun.kt:29
 Disconnected from the target VM
 
diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepInto/siSuspendFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/siSuspendFun.kt
index 238deb8927d..14e7205452e 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/stepInto/siSuspendFun.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/stepInto/siSuspendFun.kt
@@ -3,23 +3,23 @@ package siSuspendFun
 import forTests.builder
 
 private fun foo(): Int {
-    return 42                                                      // 8
+    return 42                                                      // 6
 }
 
 // One line suspend wihtout doResume
-suspend fun fourth() = foo()                                       // 7
+suspend fun fourth() = foo()                                       // 5
 
 // Multiline suspend without doResume
 suspend fun third() : Int? {
-    return fourth()                                                // 6
+    return fourth()                                                // 4
 }
 
 // One line suspend with doResume
-suspend fun second(): Int = third()?.let { return it } ?: 0        // 4 (FIX IT!) 5
+suspend fun second(): Int = third()?.let { return it } ?: 0        // 3
 
 // Multiline suspend with doResume
-suspend fun first(): Int {                                         // 2 (FIX IT!)
-    second()                                                       // 3
+suspend fun first(): Int {                                         //
+    second()                                                       // 2
     return 12
 }
 
@@ -31,4 +31,4 @@ fun main(args: Array<String>) {
     }
 }
 
-// STEP_INTO: 7
\ No newline at end of file
+// STEP_INTO: 5
diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOut/souSuspendFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOut/souSuspendFun.kt
index eb1170d41e3..f0a67234821 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/stepOut/souSuspendFun.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/stepOut/souSuspendFun.kt
@@ -16,18 +16,18 @@ suspend fun third() : Int? {
 }
 
 // One line suspend with doResume
-suspend fun second(): Int = third()?.let { return it } ?: 0        // 4 5 (FIX IT)
+suspend fun second(): Int = third()?.let { return it } ?: 0        // 4 (FIX IT)
 
 // Multiline suspend with doResume
 suspend fun first(): Int {
-    second()                                                       // 6
+    second()                                                       // 5
     return 12
-}                                                                  // 7 (FIX IT)
+}
 
 fun main(args: Array<String>) {
     builder {
-        first()                                                    // 8
+        first()                                                    // 6
     }
 }
 
-// STEP_OUT: 7
\ No newline at end of file
+// STEP_OUT: 5