diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsImpl.kt
index d39cb463889..b39fb744c50 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsImpl.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsImpl.kt
@@ -17,14 +17,12 @@
 package org.jetbrains.kotlin.gradle.dsl
 
 import org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments
-import org.jetbrains.kotlin.cli.js.dce.K2JSDce
 
 internal class KotlinJsDceOptionsImpl : KotlinJsDceOptionsBase() {
     override var freeCompilerArgs: List<String> = listOf()
 
     override fun updateArguments(args: K2JSDceArguments) {
         super.updateArguments(args)
-        val freeArgsArray = (freeCompilerArgs as List<Any>).map(Any::toString).toTypedArray()
-        K2JSDce().parseArguments(freeArgsArray, args)
+        copyFreeCompilerArgsToArgs(args)
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt
index ae73b2b5350..634dc8af22d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt
@@ -23,8 +23,6 @@ internal class KotlinJsOptionsImpl : KotlinJsOptionsBase() {
 
     override fun updateArguments(args: K2JSCompilerArguments) {
         super.updateArguments(args)
-        // cast to List<Any> is important because in Groovy a GString can be inside of a list
-        val freeArgs = (freeCompilerArgs as List<Any>).map(Any::toString)
-        args.freeArgs.addAll(freeArgs)
+        copyFreeCompilerArgsToArgs(args)
     }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt
index 889eb2658e9..5ff1c1902ce 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt
@@ -23,8 +23,6 @@ internal class KotlinJvmOptionsImpl : KotlinJvmOptionsBase() {
 
     override fun updateArguments(args: K2JVMCompilerArguments) {
         super.updateArguments(args)
-        // cast to List<Any> is important because in Groovy a GString can be inside of a list
-        val freeArgs = (freeCompilerArgs as List<Any>).map(Any::toString)
-        args.freeArgs.addAll(freeArgs)
+        copyFreeCompilerArgsToArgs(args)
     }
 }