diff --git a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
index f7d78f49cf0..8617f13f719 100644
--- a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
+++ b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
@@ -62,7 +62,7 @@ public class BytecodeCompiler {
         }
 
         // lets register any compiler plugins
-        env.getEnvironment().getCompilerPlugins().addAll(getCompilerPlugins());
+        env.getCompilerPlugins().addAll(getCompilerPlugins());
 
         return env;
     }
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java
index 1b058ad0151..54a6eef6608 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java
@@ -239,7 +239,7 @@ public class KotlinCompiler {
         // install any compiler plugins
         List<CompilerPlugin> plugins = arguments.getCompilerPlugins();
         if (plugins != null) {
-            configuration.getEnvironment().getCompilerPlugins().addAll(plugins);
+            configuration.getCompilerPlugins().addAll(plugins);
         }
 
         if (configuration.getCompilerDependencies().getRuntimeJar() != null) {
diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentConfiguration.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentConfiguration.java
index 2b73bd0e964..cf57bee50b2 100644
--- a/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentConfiguration.java
+++ b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentConfiguration.java
@@ -16,11 +16,14 @@
 
 package org.jetbrains.jet.compiler;
 
+import com.google.common.collect.Lists;
 import com.intellij.openapi.util.Disposer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.compiler.messages.MessageCollector;
 import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
 
+import java.util.List;
+
 /**
  * @author abreslav
  */
@@ -29,6 +32,8 @@ public class CompileEnvironmentConfiguration {
     private final CompilerDependencies compilerDependencies;
     private final MessageCollector messageCollector;
 
+    private List<CompilerPlugin> compilerPlugins = Lists.newArrayList();
+
     /**
      * NOTE: It's very important to call dispose for every object of this class or there will be memory leaks.
      * @see Disposer
@@ -53,4 +58,8 @@ public class CompileEnvironmentConfiguration {
     public MessageCollector getMessageCollector() {
         return messageCollector;
     }
+
+    public List<CompilerPlugin> getCompilerPlugins() {
+        return compilerPlugins;
+    }
 }
diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java
index c3f24f3179e..bd8eb357ccf 100644
--- a/compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java
@@ -46,7 +46,6 @@ import java.util.List;
  */
 public class JetCoreEnvironment extends JavaCoreEnvironment {
     private final List<JetFile> sourceFiles = new ArrayList<JetFile>();
-    private List<CompilerPlugin> compilerPlugins = new ArrayList<CompilerPlugin>();
 
     public JetCoreEnvironment(Disposable parentDisposable, @NotNull CompilerDependencies compilerDependencies) {
         super(parentDisposable);
@@ -138,14 +137,6 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
         return sourceFiles;
     }
 
-    public List<CompilerPlugin> getCompilerPlugins() {
-        return compilerPlugins;
-    }
-
-    public void setCompilerPlugins(List<CompilerPlugin> compilerPlugins) {
-        this.compilerPlugins = compilerPlugins;
-    }
-
     public void addToClasspathFromClassLoader(ClassLoader loader) {
         ClassLoader parent = loader.getParent();
         if(parent != null)
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
index 5b84e81777c..a4256f29f55 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
@@ -20,16 +20,16 @@ fun main(args: Array<String?>): Unit {
  */
 class KDocCompiler() : KotlinCompiler() {
 
-    protected override fun configureEnvironment(environment : CompileEnvironmentConfiguration?, arguments : CompilerArguments?) {
-        super.configureEnvironment(environment, arguments)
-        val coreEnvironment = environment?.getEnvironment()
+    protected override fun configureEnvironment(configuration : CompileEnvironmentConfiguration?, arguments : CompilerArguments?) {
+        super.configureEnvironment(configuration, arguments)
+        val coreEnvironment = configuration?.getEnvironment()
         if (coreEnvironment != null) {
             val kdoc = KDoc()
 
             if (arguments is KDocArguments) {
                 kdoc.config = arguments.apply()
             }
-            val plugins = coreEnvironment.getCompilerPlugins().orEmpty()
+            val plugins = configuration?.getCompilerPlugins().orEmpty()
 /*
             val sourcePlugin = HtmlCompilerPlugin()
             plugins.add(sourcePlugin)