Fix the conflict resolution from the last merge
Revert "Revert "Merge pull request #2093 from boggle/2.1-resolve-tokens""

This reverts commit c1ec95f1b8edd4b957e1e9b19c09befef30dcefa.