Another ember auto refactor.