--- a/browser/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js
@@ -1,16 +1,11 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*
-#if 0
-Workaround a build system bug where this file doesn't get packaged if not pre-processed.
-#endif
-*/
 
 /* exported install, uninstall, startup, shutdown */
 
 "use strict";
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");

--- a/browser/tools/mozscreenshots/mozscreenshots/extension/moz.build
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/moz.build
@@ -6,12 +6,15 @@
 
 XPI_NAME = 'mozscreenshots'
 
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
 NO_JS_MANIFEST = True
 
+FINAL_TARGET_FILES += [
+    'bootstrap.js'
+]
+
 FINAL_TARGET_PP_FILES += [
-    'bootstrap.js',
     'install.rdf',
 ]