diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 90b7960da..fbb902f06 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -100,14 +100,6 @@ module.exports = (grunt) ->
         src:  'test.html'
         dest: 'index.html'
 
-    coffee:
-      script:
-        src:  'tmp/script-<%= pkg.type %>.coffee'
-        dest: 'tmp/script-<%= pkg.type %>.js'
-      eventPage:
-        src:  'src/General/eventPage.coffee'
-        dest: 'tmp/eventPage.js'
-
     concurrent:
       build: [
         'build-crx'
@@ -119,15 +111,22 @@ module.exports = (grunt) ->
         stdout: true
         stderr: true
         failOnError: true
-      'templates-crx':
-        command: 'node_modules/.bin/coffee tools/templates.coffee tmp/script.coffee tmp/script-crx.coffee crx - <%= pkg.tests_enabled || "" %>'.replace(/\//g, path.sep)
+      crx:
+        command: """
+          node_modules/.bin/coffee tools/templates.coffee tmp/script.coffee tmp/script-crx.coffee crx - <%= pkg.tests_enabled || "" %>
+          node_modules/.bin/coffee --no-header -c tmp/script-crx.coffee
+          node_modules/.bin/coffee --no-header -o tmp -c src/General/eventPage.coffee
+        """.split('\n').join('&&').replace(/\//g, path.sep)
       'templates-crx-meta':
         command: """
           node_modules/.bin/coffee tools/templates.coffee src/meta/updates.xml testbuilds/updates<%= pkg.meta.suffix[pkg.channel] %>.xml crx <%= pkg.channel %>
           node_modules/.bin/coffee tools/templates.coffee src/meta/manifest.json testbuilds/crx<%= pkg.meta.suffix[pkg.channel] %>/manifest.json crx <%= pkg.channel %>
         """.split('\n').join('&&').replace(/\//g, path.sep)
-      'templates-userscript':
-        command: 'node_modules/.bin/coffee tools/templates.coffee tmp/script.coffee tmp/script-userscript.coffee userscript - <%= pkg.tests_enabled || "" %>'.replace(/\//g, path.sep)
+      userscript:
+        command: """
+          node_modules/.bin/coffee tools/templates.coffee tmp/script.coffee tmp/script-userscript.coffee userscript - <%= pkg.tests_enabled || "" %>
+          node_modules/.bin/coffee --no-header -c tmp/script-userscript.coffee
+        """.split('\n').join('&&').replace(/\//g, path.sep)
       'templates-userscript-meta':
         command: 'node_modules/.bin/coffee tools/templates.coffee src/meta/metadata.js testbuilds/<%= pkg.name %><%= pkg.meta.suffix[pkg.channel] %>.meta.js userscript <%= pkg.channel %>'.replace(/\//g, path.sep)
       commit:
@@ -323,9 +322,7 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'build-crx', [
     'set-build:crx'
-    'shell:templates-crx'
-    'coffee:script'
-    'coffee:eventPage'
+    'shell:crx'
     'jshint:crx'
     'set-channel:stable'
     'build-crx-channel'
@@ -372,8 +369,7 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'build-userscript', [
     'set-build:userscript'
-    'shell:templates-userscript'
-    'coffee:script'
+    'shell:userscript'
     'jshint:userscript'
     'set-channel:stable'
     'build-userscript-channel'
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e501fe881..37e680d19 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -4,8 +4,8 @@
   "node-version": "v4.3.1",
   "dependencies": {
     "coffee-script": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.9.3.tgz"
     },
     "crx": {
       "version": "3.0.3",
@@ -1255,62 +1255,6 @@
         }
       }
     },
-    "grunt-contrib-coffee": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.13.0.tgz",
-      "dependencies": {
-        "chalk": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "dependencies": {
-            "ansi-styles": {
-              "version": "1.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
-            },
-            "escape-string-regexp": {
-              "version": "1.0.5",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-            },
-            "has-ansi": {
-              "version": "0.1.0",
-              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "strip-ansi": {
-              "version": "0.3.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "supports-color": {
-              "version": "0.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
-            }
-          }
-        },
-        "coffee-script": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.9.3.tgz"
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        },
-        "uri-path": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz"
-        }
-      }
-    },
     "grunt-contrib-concat": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-1.0.0.tgz",
diff --git a/package.json b/package.json
index 910f44f26..02cec87ba 100644
--- a/package.json
+++ b/package.json
@@ -59,14 +59,13 @@
     }
   },
   "devDependencies": {
-    "coffee-script": "^1.10.0",
+    "coffee-script": "1.9.3",
     "crx": "^3.0.3",
     "font-awesome": "4.5.0",
     "glob": "^7.0.3",
     "grunt": "^1.0.1",
     "grunt-concurrent": "^2.3.0",
     "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-coffee": "^0.13.0",
     "grunt-contrib-concat": "^1.0.0",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-jshint": "^1.0.0",