diff --git a/src/atom.coffee b/src/atom.coffee
index 427811162..55cb7ee59 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -10,16 +10,11 @@ _ = require 'underscore-plus'
 {CompositeDisposable, Emitter} = require 'event-kit'
 fs = require 'fs-plus'
 {convertStackTrace, convertLine} = require 'coffeestack'
-
+Model = require './model'
 {$} = require './space-pen-extensions'
 WindowEventHandler = require './window-event-handler'
 StylesElement = require './styles-element'
 
-if includeDeprecations
-  {Model} = require 'theorist'
-else
-  Model = require './model'
-
 # Essential: Atom global for dealing with packages, themes, menus, and the window.
 #
 # An instance of this class is always available as the `atom` global.
diff --git a/src/model.coffee b/src/model.coffee
index b590082a5..20128b0d2 100644
--- a/src/model.coffee
+++ b/src/model.coffee
@@ -1,3 +1,8 @@
+Grim = require 'grim'
+if Grim.includeDeprecations
+  module.exports = require('theorist').Model
+  return
+
 PropertyAccessors = require 'property-accessors'
 
 nextInstanceId = 1