diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
index b2cc642ec76..b01acb8fa2e 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
@@ -128,13 +128,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
             ImportClassHelper.addImportDirectiveIfNeeded(returnType, file);
         }
 
-        final String initializer = defaultInitializer(returnType, stdlib);
-        if (initializer != null) {
-            bodyBuilder.append(" = ").append(initializer);
-        }
-        else {
-            bodyBuilder.append("{").append("throw UnsupportedOperationException()").append("}");
-        }
+        bodyBuilder.append("{").append("throw UnsupportedOperationException()").append("}");
 
         return JetPsiFactory.createFunction(project, bodyBuilder.toString());
     }
diff --git a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
index 962f03764e9..2fee4d5fe4e 100644
--- a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
@@ -14,5 +14,7 @@ class SomeOther<S> : Some<S> {
     override fun someGenericFoo(): S {
         throw UnsupportedOperationException()
     }
-    override fun someOtherFoo(): Int = 0
+    override fun someOtherFoo(): Int {
+        throw UnsupportedOperationException()
+    }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
index 8ec50fce31e..1ccd7a1510d 100644
--- a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
@@ -4,5 +4,7 @@ trait G<T> {
 
 class GC() : G<Int> {
 
-    override fun foo(t: Int): Int = 0
+    override fun foo(t: Int): Int {
+        throw UnsupportedOperationException()
+    }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
index 6554a1fc9fb..a8d4e037f35 100644
--- a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
@@ -2,5 +2,7 @@ import foo.Intf
 
 class Impl(): Intf {
 
-    override fun getFooBar(): String? = null
+    override fun getFooBar(): String? {
+        throw UnsupportedOperationException()
+    }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
index 5ad1f152481..85e528cce48 100644
--- a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
@@ -4,5 +4,7 @@ trait Some {
 
 class SomeOther : Some {
 
-    override fun foo(some: Int?): Int = 0
+    override fun foo(some: Int?): Int {
+        throw UnsupportedOperationException()
+    }
 }
\ No newline at end of file