another wave of change from upstream/ember-model (f593c9968c2d8078ab2f4e6f9f4e5b3e33f13219)