diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/AbstractClosureAnnotator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/AbstractClosureAnnotator.kt
index 50e0194e055..68a217f8cee 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/AbstractClosureAnnotator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/AbstractClosureAnnotator.kt
@@ -84,13 +84,6 @@ abstract class AbstractClosureAnnotator : IrElementVisitorVoid {
         closuresStack.peek()?.addNested(closure)
     }
 
-    // TODO: remove as soon as bug in IrSetterCallImpl is fixed.
-    override fun visitCall(expression: IrCall) {
-        super.visitCall(expression)
-        if (expression is IrSetterCallImpl)
-            visitElement(expression.getValueArgument(0)!!)
-    }
-
     override fun visitFunction(declaration: IrFunction) {
         val functionDescriptor = declaration.descriptor
         val closureBuilder = FunctionClosureBuilder(functionDescriptor)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
index 896c309263c..fd371547225 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
@@ -645,13 +645,6 @@ class LocalDeclarationsLowering(val context: BackendContext) : DeclarationContai
                     element.acceptChildrenVoid(this)
                 }
 
-                // TODO: remove as soon as bug in IrSetterCallImpl is fixed.
-                override fun visitCall(expression: IrCall) {
-                    super.visitCall(expression)
-                    if (expression is IrSetterCallImpl)
-                        visitElement(expression.getValueArgument(0)!!)
-                }
-
                 private fun DeclarationDescriptor.declaredInFunction() = when (this.containingDeclaration) {
                     is CallableDescriptor -> true
                     is ClassDescriptor -> false