diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
index 3931b4389ea..037c314fa5c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
@@ -8,23 +8,21 @@ package org.jetbrains.kotlin.idea.intentions
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+import org.jetbrains.kotlin.psi.KtBinaryExpression
+import org.jetbrains.kotlin.psi.KtNameReferenceExpression
+import org.jetbrains.kotlin.psi.KtPsiFactory
+import org.jetbrains.kotlin.psi.createExpressionByPattern
 
 class ReplaceWithOrdinaryAssignmentIntention : SelfTargetingIntention<KtBinaryExpression>(
     KtBinaryExpression::class.java,
     KotlinBundle.lazyMessage("replace.with.ordinary.assignment")
 ), LowPriorityAction {
     override fun isApplicableTo(element: KtBinaryExpression, caretOffset: Int): Boolean {
-        val operationReference = element.operationReference
-        if (!operationReference.textRange.containsOffset(caretOffset)) return false
         if (element.operationToken !in KtTokens.AUGMENTED_ASSIGNMENTS) return false
-        val left = element.left ?: return false
-        if ((left.safeAs<KtQualifiedExpression>()?.selectorExpression ?: left) !is KtNameReferenceExpression) return false
+        if (element.left !is KtNameReferenceExpression) return false
         if (element.right == null) return false
-        return operationReference.mainReference.resolve().safeAs<KtFunction>()?.name?.endsWith("Assign") != true
+        return element.operationReference.textRange.containsOffset(caretOffset)
     }
 
     override fun applyTo(element: KtBinaryExpression, editor: Editor?) {
diff --git a/idea/testData/intentions/replaceWithOrdinaryAssignment/minusAssignOperatorFun.kt b/idea/testData/intentions/replaceWithOrdinaryAssignment/minusAssignOperatorFun.kt
deleted file mode 100644
index bf31689856a..00000000000
--- a/idea/testData/intentions/replaceWithOrdinaryAssignment/minusAssignOperatorFun.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// IS_APPLICABLE: false
-operator fun Int.minusAssign(element: Int) {}
-
-fun test() {
-    val x = 1
-    x <caret>-= 9
-}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceWithOrdinaryAssignment/mutableList.kt b/idea/testData/intentions/replaceWithOrdinaryAssignment/mutableList.kt
deleted file mode 100644
index 792fda02f33..00000000000
--- a/idea/testData/intentions/replaceWithOrdinaryAssignment/mutableList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-// IS_APPLICABLE: false
-// WITH_RUNTIME
-fun main() {
-    val mutableList = mutableListOf(4, 5, 6, 7, 8)
-    mutableList <caret>+= 9
-}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceWithOrdinaryAssignment/plusAssignOperatorFun.kt b/idea/testData/intentions/replaceWithOrdinaryAssignment/plusAssignOperatorFun.kt
deleted file mode 100644
index 7a1aa5b0839..00000000000
--- a/idea/testData/intentions/replaceWithOrdinaryAssignment/plusAssignOperatorFun.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// IS_APPLICABLE: false
-operator fun Int.plusAssign(element: Int)  {}
-
-fun test() {
-    val x = 1
-    x <caret>+= 9
-}
diff --git a/idea/testData/intentions/replaceWithOrdinaryAssignment/qualifiedExpression.kt b/idea/testData/intentions/replaceWithOrdinaryAssignment/qualifiedExpression.kt
deleted file mode 100644
index d5edf99798b..00000000000
--- a/idea/testData/intentions/replaceWithOrdinaryAssignment/qualifiedExpression.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class Foo {
-    var x: Int = 1
-}
-
-fun main() {
-    val foo = Foo()
-    foo.x <caret>+= 1
-}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceWithOrdinaryAssignment/qualifiedExpression.kt.after b/idea/testData/intentions/replaceWithOrdinaryAssignment/qualifiedExpression.kt.after
deleted file mode 100644
index 1d8cbf8d48f..00000000000
--- a/idea/testData/intentions/replaceWithOrdinaryAssignment/qualifiedExpression.kt.after
+++ /dev/null
@@ -1,8 +0,0 @@
-class Foo {
-    var x: Int = 1
-}
-
-fun main() {
-    val foo = Foo()
-    foo.x = foo.x + 1
-}
\ No newline at end of file
diff --git a/idea/testData/quickfix/allowResolveInWriteAction.txt b/idea/testData/quickfix/allowResolveInWriteAction.txt
index 29c3a220e09..cf806580272 100644
--- a/idea/testData/quickfix/allowResolveInWriteAction.txt
+++ b/idea/testData/quickfix/allowResolveInWriteAction.txt
@@ -18,7 +18,6 @@ org.jetbrains.kotlin.idea.intentions.ConvertPropertyInitializerToGetterIntention
 org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
 org.jetbrains.kotlin.idea.intentions.MoveMemberToCompanionObjectIntention
 org.jetbrains.kotlin.idea.intentions.MovePropertyToConstructorIntention
-org.jetbrains.kotlin.idea.intentions.ReplaceWithOrdinaryAssignmentIntention
 org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
 org.jetbrains.kotlin.idea.quickfix.AddAnnotationTargetFix
 org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
diff --git a/idea/testData/quickfix/assignOperatorAmbiguity/changeToVal/classVariable.kt b/idea/testData/quickfix/assignOperatorAmbiguity/changeToVal/classVariable.kt
index a7a744ecfcd..8d4fbff5b16 100644
--- a/idea/testData/quickfix/assignOperatorAmbiguity/changeToVal/classVariable.kt
+++ b/idea/testData/quickfix/assignOperatorAmbiguity/changeToVal/classVariable.kt
@@ -1,6 +1,7 @@
 // "Change 'list' to val" "false"
 // ACTION: Replace overloaded operator with function call
 // ACTION: Replace with 'plusAssign()' call
+// ACTION: Replace with ordinary assignment
 // ERROR: Assignment operators ambiguity: <br>public operator fun <T> Collection<Int>.plus(element: Int): List<Int> defined in kotlin.collections<br>public inline operator fun <T> MutableCollection<in Int>.plusAssign(element: Int): Unit defined in kotlin.collections
 // WITH_RUNTIME
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index d8a8fcd66ee..2511560132d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -15607,16 +15607,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/replaceWithOrdinaryAssignment/complexRightExpression.kt");
         }
 
-        @TestMetadata("minusAssignOperatorFun.kt")
-        public void testMinusAssignOperatorFun() throws Exception {
-            runTest("idea/testData/intentions/replaceWithOrdinaryAssignment/minusAssignOperatorFun.kt");
-        }
-
-        @TestMetadata("mutableList.kt")
-        public void testMutableList() throws Exception {
-            runTest("idea/testData/intentions/replaceWithOrdinaryAssignment/mutableList.kt");
-        }
-
         @TestMetadata("nonAssignmentExpression.kt")
         public void testNonAssignmentExpression() throws Exception {
             runTest("idea/testData/intentions/replaceWithOrdinaryAssignment/nonAssignmentExpression.kt");
@@ -15627,16 +15617,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/replaceWithOrdinaryAssignment/nonAugmentedAssign.kt");
         }
 
-        @TestMetadata("plusAssignOperatorFun.kt")
-        public void testPlusAssignOperatorFun() throws Exception {
-            runTest("idea/testData/intentions/replaceWithOrdinaryAssignment/plusAssignOperatorFun.kt");
-        }
-
-        @TestMetadata("qualifiedExpression.kt")
-        public void testQualifiedExpression() throws Exception {
-            runTest("idea/testData/intentions/replaceWithOrdinaryAssignment/qualifiedExpression.kt");
-        }
-
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
             runTest("idea/testData/intentions/replaceWithOrdinaryAssignment/simple.kt");