diff --git a/gruntfile.js b/gruntfile.js
index 5e10601f1..b72c15641 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -180,7 +180,8 @@ module.exports = function(grunt) {
     tsOptions.compiler = "node_modules/typescript/bin/tsc";
     tsOptions.failOnTypeErrors = true;
     tsOptions.outDir = localCfg.outModulesDir;
-    tsOptions.additionalFlags = "--outDir " + localCfg.outModulesDir;
+    var removeCommentsArgument = tsOptions.removeComments ? " --removeComments" : "";
+    tsOptions.additionalFlags = "--outDir " + localCfg.outModulesDir + removeCommentsArgument;
 
     grunt.initConfig({
         localCfg : localCfg,
diff --git a/tsconfig.json b/tsconfig.json
index 65d6a45e4..ef362af3d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,7 +8,6 @@
         "module": "commonjs",
         "declaration": false,
         "noImplicitAny": false,
-        "removeComments": true,
         "noImplicitUseStrict": true,
         "experimentalDecorators": true
     },
@@ -711,4 +710,4 @@
     "atom": {
         "rewriteTsconfig": true
     }
-}
\ No newline at end of file
+}