TS-2564 Revert field token ordering.

(cherry picked from commit 8d7d25db897269988bcc1df662cd77d5707c34c4)
Update CHANGES