Hopefully Ember will be updated to mend this :(