Revert Ember stuff