Restart work on refactor branch.