Revert "Merge pull request #2093 from boggle/2.1-resolve-tokens"

This reverts commit ff59de12fb37442e10ea75d9e9b411aa8504a702, reversing
changes made to 27a8c40fb80aefefbe169c03216cd2c9151f9278.