diff --git a/package.json b/package.json
index b5c545449..18bb7d68f 100644
--- a/package.json
+++ b/package.json
@@ -140,6 +140,7 @@
     "babel-plugin-external-helpers": "^6.18.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.20.0",
     "babel-plugin-transform-async-to-generator": "6.16.0",
+    "babel-plugin-transform-class-properties": "^6.18.0",
     "babel-plugin-transform-flow-strip-types": "^6.21.0",
     "babel-plugin-transform-object-rest-spread": "^6.20.2",
     "babel-polyfill": "^6.20.0",
diff --git a/packager/babelRegisterOnly.js b/packager/babelRegisterOnly.js
index 1f4d3e6f9..fbb839da4 100644
--- a/packager/babelRegisterOnly.js
+++ b/packager/babelRegisterOnly.js
@@ -25,6 +25,7 @@ function config(onlyList) {
       'syntax-trailing-function-commas',
       'transform-object-rest-spread',
       'transform-async-to-generator',
+      'transform-class-properties',
     ].map(pluginName => require(`babel-plugin-${pluginName}`)),
     only: _only,
     retainLines: true,
diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index 4e71580f3..e667cd7c6 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -110,15 +110,15 @@ function tryResolveSync<T>(action: () => T, secondaryAction: () => T): T {
 }
 
 class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
-  _doesFileExist: (filePath: string) => boolean;
+  _doesFileExist = filePath => this._options.hasteFS.exists(filePath);
   _immediateResolutionCache: {[key: string]: TModule};
   _options: Options<TModule, TPackage>;
-  static emptyModule: string;
+
+  static EMPTY_MODULE: string = require.resolve('./assets/empty-module.js');
 
   constructor(options: Options<TModule, TPackage>) {
     this._options = options;
     this._resetResolutionCache();
-    this._doesFileExist = filePath => this._options.hasteFS.exists(filePath);
   }
 
   _tryResolve<T>(
@@ -465,7 +465,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
     );
     if (realModuleName === false) {
       return this._loadAsFile(
-        ResolutionRequest.emptyModule,
+        ResolutionRequest.EMPTY_MODULE,
         fromModule,
         toModuleName,
       );
@@ -485,7 +485,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
     // exclude
     if (realModuleName === false) {
       return this._loadAsFile(
-        ResolutionRequest.emptyModule,
+        ResolutionRequest.EMPTY_MODULE,
         fromModule,
         toModuleName,
       );
@@ -814,6 +814,4 @@ function getArrayLowestItem(a: Array<string>): string | void {
   return lowest;
 }
 
-ResolutionRequest.emptyModule = require.resolve('./assets/empty-module.js');
-
 module.exports = ResolutionRequest;
diff --git a/packager/src/node-haste/__tests__/DependencyGraph-test.js b/packager/src/node-haste/__tests__/DependencyGraph-test.js
index 7b6c536ad..b567bdf0f 100644
--- a/packager/src/node-haste/__tests__/DependencyGraph-test.js
+++ b/packager/src/node-haste/__tests__/DependencyGraph-test.js
@@ -1819,7 +1819,7 @@ describe('DependencyGraph', function() {
       });
 
       it('should support browser exclude of a package ("' + fieldName + '")', function() {
-        ResolutionRequest.emptyModule = '/root/emptyModule.js';
+        ResolutionRequest.EMPTY_MODULE = '/root/emptyModule.js';
         var root = '/root';
         setMockFileSystem({
           'root': {
@@ -1885,7 +1885,7 @@ describe('DependencyGraph', function() {
       });
 
       it('should support browser exclude of a file ("' + fieldName + '")', function() {
-        ResolutionRequest.emptyModule = '/root/emptyModule.js';
+        ResolutionRequest.EMPTY_MODULE = '/root/emptyModule.js';
 
         var root = '/root';
         setMockFileSystem({