Upstream fix for Ember 1.8.1 release

[Ember issue 9436](https://github.com/emberjs/ember.js/issues/9436).

I sadly lack the context and don't know why it fixes the issue in Ember
but I know we're tight on schedule to ship 1.8.1 so hence this "fix".