Revert "more token handling changes"

This reverts commit 3f717f2f990a313ccc9ae9bf5ea9cd6b9d53cee9.
Revert "changing token handling"

This reverts commit 5b2f8a5ed5cb4e0f343b396083bfb9ece09a4512.