I guess this goes away with updated ember?