diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt
index 1bb532b9205..6949c3c8457 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt
@@ -16,9 +16,9 @@
 
 package org.jetbrains.kotlin.resolve.scopes
 
-import com.google.common.collect.Multimap
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.descriptors.VariableDescriptor
 
 public interface WritableScope : JetScope {
     public enum class LockLevel {
@@ -29,7 +29,7 @@ public interface WritableScope : JetScope {
 
     public fun takeSnapshot(): JetScope
 
-    public fun changeLockLevel(lockLevel: LockLevel): WritableScope
+    public fun changeLockLevel(lockLevel: LockLevel)
 
     public fun addVariableDescriptor(variableDescriptor: VariableDescriptor)
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
index 7aa6569cb89..303806f2676 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
@@ -58,12 +58,11 @@ public class WritableScopeImpl @jvmOverloads constructor(
 
     override fun getContainingDeclaration() = ownerDeclarationDescriptor
 
-    override fun changeLockLevel(lockLevel: WritableScope.LockLevel): WritableScope {
+    override fun changeLockLevel(lockLevel: WritableScope.LockLevel) {
         if (lockLevel.ordinal() < this.lockLevel.ordinal()) {
             throw IllegalStateException("cannot lower lock level from " + this.lockLevel + " to " + lockLevel + " at " + toString())
         }
         this.lockLevel = lockLevel
-        return this
     }
 
     protected fun checkMayRead() {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index 03264dc2391..8acf806518b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -356,6 +356,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
             ) {
                 receiverClassDescriptor.getTypeConstructor().getParameters().forEach { addClassifierDescriptor(it) }
                 changeLockLevel(WritableScope.LockLevel.READING)
+                this
             }
 
             val projections = receiverClassDescriptor.getTypeConstructor().getParameters()