I've patched the official ember-data