WIP -- finding workaround for Ember Data bug:

https://github.com/emberjs/data/issues/1913