This reverts commit ec7efbde1a. This is causing problems in non-ember-cli environments. Reverting for now.
ec7efbde1a