Undone all changes in TokenEngine so this branch can be merged to master safely