diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
index 9cef31e0da5..eb4aca3017e 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
@@ -206,15 +206,10 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
         StringBuilder body = new StringBuilder();
         String defaultInitializer = CodeInsightUtils.defaultInitializer(descriptor.getType());
         String initializer = defaultInitializer != null ? " = " + defaultInitializer : " = ?";
-        if (descriptor.getExtensionReceiverParameter() != null) {
-            body.append("\nget()");
-            body.append(initializer);
-            if (descriptor.isVar()) {
-                body.append("\nset(value) {}");
-            }
-        }
-        else {
-            body.append(initializer);
+        body.append("\nget()");
+        body.append(initializer);
+        if (descriptor.isVar()) {
+            body.append("\nset(value) {}");
         }
         return JetPsiFactory(project).createProperty(OVERRIDE_RENDERER.render(newDescriptor) + body);
     }
diff --git a/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after b/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
index 726f3a081b0..368deeadb1d 100644
--- a/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
@@ -21,7 +21,9 @@ class C : Base<String, C, Unit>() {
         return super<Base>.hashCode()
     }
 
-    override val method: (String?) -> String = ?
+    override val method: (String?) -> String
+        get() = ?
+
     override fun toString(): String {
         return super<Base>.toString()
     }
diff --git a/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
index 1100b2ca473..64a8e185ea0 100644
--- a/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
@@ -5,7 +5,8 @@ trait A {
 
 fun some() : A {
     return object : A {<caret>
-        override val method: () -> Unit? = ?
+        override val method: () -> Unit?
+            get() = ?
     }
 }
 
diff --git a/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after b/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
index 5c410c270ba..ab8bb95acee 100644
--- a/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
@@ -23,17 +23,23 @@ class C : A(), B {
         super<A>.internalFun()
     }
 
-    override val internalProperty: Int = 0
+    override val internalProperty: Int
+        get() = 0
+
     override fun protectedFun() {
         super<A>.protectedFun()
     }
 
-    override val protectedProperty: Int = 0
+    override val protectedProperty: Int
+        get() = 0
+
     override fun publicFun() {
         super<A>.publicFun()
     }
 
-    override val publicProperty: Int = 0
+    override val publicProperty: Int
+        get() = 0
+
     override fun toString(): String {
         return super<A>.toString()
     }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
index db16a5d356f..8d318f3c0f8 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
@@ -4,7 +4,8 @@ open class A() {
 
 fun some() : A {
     return object : A() {<caret>
-        override val method: () -> Unit? = ?
+        override val method: () -> Unit?
+            get() = ?
     }
 }
 
diff --git a/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
index 74a2b930204..c59049391e0 100644
--- a/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
@@ -10,12 +10,20 @@ trait T {
 }
 
 class C : T {
-    override val a1: Byte = <selection><caret>0</selection>
-    override val a2: Short = 0
-    override val a3: Int = 0
-    override val a4: Long = 0
-    override val a5: Float = 0.0f
-    override val a6: Double = 0.0
-    override val a7: Char = '\u0000'
-    override val a8: Boolean = false
+    override val a1: Byte
+        get() = <selection><caret>0</selection>
+    override val a2: Short
+        get() = 0
+    override val a3: Int
+        get() = 0
+    override val a4: Long
+        get() = 0
+    override val a5: Float
+        get() = 0.0f
+    override val a6: Double
+        get() = 0.0
+    override val a7: Char
+        get() = '\u0000'
+    override val a8: Boolean
+        get() = false
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
index 91352cb84ea..87a4649f692 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
@@ -6,7 +6,9 @@ open class A() {
 class C : A() {
     val constant = 42
     // Some comment
-    override val bar: Int = <selection><caret>0</selection>
+    override val bar: Int
+        get() = <selection><caret>0</selection>
+
     override fun equals(other: Any?): Boolean {
         return super<A>.equals(other)
     }
diff --git a/idea/testData/codeInsight/overrideImplement/property.kt.after b/idea/testData/codeInsight/overrideImplement/property.kt.after
index cacc967511f..a3c9619fd3b 100644
--- a/idea/testData/codeInsight/overrideImplement/property.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/property.kt.after
@@ -3,5 +3,6 @@ trait T {
 }
 
 class GC() : T {
-    override val v: Int = <selection><caret>0</selection>
+    override val v: Int
+        get() = <selection><caret>0</selection>
 }
diff --git a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
index 673b3f47cd2..c9b893b88ee 100644
--- a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
@@ -9,7 +9,9 @@ class SomeTest : Test {
         <selection><caret>throw UnsupportedOperationException()</selection>
     }
 
-    override val testProp: Int = 0
+    override val testProp: Int
+        get() = 0
+
     /**
      * test
      */