Fixes #1496 - Ember 1.0 regression