diff --git a/config/webpack/production.js b/config/webpack/production.js
index 1cf1b7fe6..7684a100b 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -1,7 +1,5 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
 const environment = require('./environment');
-const config = environment.toWebpackConfig();
-delete config.optimization.minimizer;
 
-module.exports = config;
+module.exports = environment.toWebpackConfig();
diff --git a/package.json b/package.json
index 8a5bfb856..ac83d7fb4 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "angular-translate-loader-partial": "2.18",
     "angular-ui-bootstrap": "1.2.5",
     "angular-ui-calendar": "^1.0.2",
-    "angular-ui-codemirror": "^0.3.0",
+    "angular-ui-codemirror": "https://github.com/swimlane/ui-codemirror.git#master",
     "angular-ui-tour": "https://github.com/sleede/angular-ui-tour.git#master",
     "angular-unsavedchanges": "0.2",
     "angular-xeditable": "0.10",
diff --git a/yarn.lock b/yarn.lock
index 6c817dc26..e90597b0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1355,10 +1355,9 @@ angular-ui-calendar@^1.0.2:
   resolved "https://registry.yarnpkg.com/angular-ui-calendar/-/angular-ui-calendar-1.0.2.tgz#fa271057425572efaadf6660243cc33cb99f33c1"
   integrity sha1-+icQV0JVcu+q32ZgJDzDPLmfM8E=
 
-angular-ui-codemirror@^0.3.0:
+"angular-ui-codemirror@https://github.com/swimlane/ui-codemirror.git#master":
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/angular-ui-codemirror/-/angular-ui-codemirror-0.3.0.tgz#e4286fc50f393f2a6e697c1bf3170424e12cbb60"
-  integrity sha1-5ChvxQ85PypuaXwb8xcEJOEsu2A=
+  resolved "https://github.com/swimlane/ui-codemirror.git#7804a5a0eae3f6cd4d541faeb2d42882e48950dc"
 
 "angular-ui-tour@https://github.com/sleede/angular-ui-tour.git#master":
   version "0.9.4"