diff --git a/ember/app/adapters/application.js b/ember/app/adapters/application.js
index 94d9c58ff..431bb96ea 100644
--- a/ember/app/adapters/application.js
+++ b/ember/app/adapters/application.js
@@ -5,15 +5,6 @@ import config from '../config/environment';
 export default JsonApiAdapter.extend({
   host: config.apiURL,
 
-  // We can get rid of this after
-  // https://github.com/kurko/ember-json-api/pull/59 is merged.
-  extractMeta: function(store, type, payload) {
-    if (payload && payload.meta) {
-      store.metaForType(type, payload.meta);
-      delete payload.meta;
-    }
-  },
-
   ajaxError: function(jqXHR) {
     var errors = this._super(jqXHR);
     if (errors instanceof DS.InvalidError) {
@@ -30,4 +21,4 @@ export default JsonApiAdapter.extend({
     return errors;
   }
   
-});
\ No newline at end of file
+});
diff --git a/ember/app/serializers/application.js b/ember/app/serializers/application.js
index 62de25084..b9064148e 100644
--- a/ember/app/serializers/application.js
+++ b/ember/app/serializers/application.js
@@ -1,13 +1,22 @@
 import JsonApiSerializer from 'ember-json-api/json-api-serializer';
 
 export default JsonApiSerializer.extend({
-	normalize: function(type, hash, property) {
-		var json = {};
+  normalize: function(type, hash, property) {
+    var json = {};
 
-		for (var prop in hash) {
-			json[prop.camelize()] = hash[prop]; 
-		}
+    for (var prop in hash) {
+      json[prop.camelize()] = hash[prop];
+    }
 
-		return this._super(type, json, property);
-	}
-});
\ No newline at end of file
+    return this._super(type, json, property);
+  },
+
+  // We can get rid of this after
+  // https://github.com/kurko/ember-json-api/pull/59 is merged.
+  extractMeta: function(store, type, payload) {
+    if (payload && payload.meta) {
+      store.setMetadataFor(type, payload.meta);
+      delete payload.meta;
+    }
+  }
+});