diff --git a/Brocfile.js b/Brocfile.js
index a696d8055d9..2c0135f24b5 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -7,13 +7,20 @@
 
 var EmberBuild = require('emberjs-build');
 var packages   = require('./lib/packages');
+var vendoredES6Package = require('emberjs-build/lib/es6-vendored-package');
 
 var emberBuild = new EmberBuild({
   name: 'ember-data',
   namespace: 'DS',
   packages: packages,
   skipTemplates: true,
-  skipRuntime: true
+  skipRuntime: true,
+  vendoredPackages: {
+    'ember-inflector': vendoredES6Package('ember-inflector', {
+      libPath: 'bower_components/ember-inflector/packages/ember-inflector/lib',
+      moduleName: 'ember-inflector'
+    })
+  }
 });
 
 module.exports = emberBuild.getDistTrees();
diff --git a/packages/ember-data/lib/serializers/rest_serializer.js b/packages/ember-data/lib/serializers/rest_serializer.js
index e36b8cbc0f9..304fc7e2560 100644
--- a/packages/ember-data/lib/serializers/rest_serializer.js
+++ b/packages/ember-data/lib/serializers/rest_serializer.js
@@ -3,12 +3,12 @@
 */
 
 import JSONSerializer from "ember-data/serializers/json_serializer";
+import { singularize } from "ember-inflector";
 var get = Ember.get;
 var forEach = Ember.ArrayPolyfills.forEach;
 var map = Ember.ArrayPolyfills.map;
 var camelize = Ember.String.camelize;
 
-import { singularize } from "ember-inflector/system/string";
 
 function coerceId(id) {
   return id == null ? null : id + '';
diff --git a/packages/ember-data/lib/system/relationship-meta.js b/packages/ember-data/lib/system/relationship-meta.js
index dbf472bfc18..747988d467c 100644
--- a/packages/ember-data/lib/system/relationship-meta.js
+++ b/packages/ember-data/lib/system/relationship-meta.js
@@ -1,4 +1,4 @@
-import { singularize } from "ember-inflector/system";
+import { singularize } from "ember-inflector";
 
 export function typeForRelationshipMeta(store, meta) {
   var typeKey, type;
diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js
index 4c3b12752d9..3b381cced83 100644
--- a/packages/ember-data/lib/system/store.js
+++ b/packages/ember-data/lib/system/store.js
@@ -9,7 +9,7 @@ import {
   InvalidError,
   Adapter
 } from "ember-data/system/adapter";
-import { singularize } from "ember-inflector/system/string";
+import { singularize } from "ember-inflector";
 import {
   Map
 } from "ember-data/system/map";