Remove hack for Ember models