diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java
index 05d3a3c69b2..e69c30cfa30 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java
@@ -94,8 +94,8 @@ public class LocalVarRemapper {
 
     public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index, MethodVisitor mv) {
         RemapInfo info = doRemap(index);
-        //add entries only for shifted vars or remapped to locals
-        if (SHIFT == info.status || REMAPPED == info.status && info.value instanceof StackValue.Local) {
+        //add entries only for shifted vars
+        if (SHIFT == info.status) {
             int newIndex = ((StackValue.Local) info.value).index;
             mv.visitLocalVariable(name, desc, signature, start, end, newIndex);
         }
diff --git a/compiler/testData/codegen/bytecodeText/inline/remappedLocalVar.kt b/compiler/testData/codegen/bytecodeText/inline/remappedLocalVar.kt
index fa4201b9b37..c65a4f94b7f 100644
--- a/compiler/testData/codegen/bytecodeText/inline/remappedLocalVar.kt
+++ b/compiler/testData/codegen/bytecodeText/inline/remappedLocalVar.kt
@@ -7,5 +7,6 @@ fun main(args: Array<String>) {
     watch(local) { it.length }
 }
 
-// 2 LOCALVARIABLE p
-// 1 LOCALVARIABLE p\$iv
\ No newline at end of file
+/*fix rollbacked cause of robovm problem*/
+// 1 LOCALVARIABLE p
+// 0 LOCALVARIABLE p\$iv
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out b/idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out
deleted file mode 100644
index 90073502a67..00000000000
--- a/idea/testData/debugger/tinyApp/outs/remappedParameterInInline.out
+++ /dev/null
@@ -1,11 +0,0 @@
-LineBreakpoint created at remappedParameterInInline.kt:7
-LineBreakpoint created at remappedParameterInInline.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! remappedParameterInInline.RemappedParameterInInlineKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-remappedParameterInInline.kt:7
-Compile bytecode for p
-remappedParameterInInline.kt:14
-Compile bytecode for p
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-
-Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/remappedParameterInInline.kt b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/remappedParameterInInline.kt
deleted file mode 100644
index 7a40e9173ce..00000000000
--- a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/remappedParameterInInline.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package remappedParameterInInline
-
-inline fun watch(p: String, f: (String) -> Int) {
-    // EXPRESSION: p
-    // RESULT: "mno": Ljava/lang/String;
-    //Breakpoint!
-    f(p)
-}
-
-inline fun inlineDefault(p: Int = 1, f: (Int) -> Unit) {
-    // EXPRESSION: p
-    // RESULT: 1: I
-    //Breakpoint!
-    f(p)
-}
-
-fun main(args: Array<String>) {
-    val local = "mno"
-    watch(local) { it.length }
-
-    inlineDefault { it }
-}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
index 30b2b5c5d60..25fb1e7945d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
@@ -784,12 +784,6 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
             doMultipleBreakpointsTest(fileName);
         }
 
-        @TestMetadata("remappedParameterInInline.kt")
-        public void testRemappedParameterInInline() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/remappedParameterInInline.kt");
-            doMultipleBreakpointsTest(fileName);
-        }
-
         @TestMetadata("whenEntry.kt")
         public void testWhenEntry() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt");