diff --git a/exports/atom.coffee b/exports/atom.coffee
index 0b59afbde..b68c5bb5e 100644
--- a/exports/atom.coffee
+++ b/exports/atom.coffee
@@ -2,10 +2,6 @@
 {Document, Point, Range, Site} = require 'telepath'
 {Emitter, Subscriber} = require 'emissary'
 
-#FIXME remove once all packages have been updated
-Emitter::trigger = (args...) => @emit(args...)
-Emitter::subscriptionCount = (args...) => @getSubscriptionCount(args...)
-
 module.exports =
   _: require '../src/underscore-extensions'
   $: require '../src/jquery-extensions'
diff --git a/src/window-bootstrap.coffee b/src/window-bootstrap.coffee
index 15da3237e..ec2d2395d 100644
--- a/src/window-bootstrap.coffee
+++ b/src/window-bootstrap.coffee
@@ -1,6 +1,11 @@
 # Like sands through the hourglass, so are the days of our lives.
 startTime = new Date().getTime()
 
+#FIXME remove once all packages have been updated
+{Emitter} = require 'emissary'
+Emitter::trigger = (args...) => @emit(args...)
+Emitter::subscriptionCount = (args...) => @getSubscriptionCount(args...)
+
 require './window'
 
 Atom = require './atom'