Use EmberDefeatureify
Merge pull request #3324 from thomasboyt/defeatureify

Defeatureify