Just for any future issue travelers, this was cleaned up in https://github.com/emberjs/ember.js/pull/4896.