Initial fix for Ember 1.0.0 RC