WIP Ember 1.8 compat