Revert "token fix"

This reverts commit fe88567ca283497a0559f756756ae787801f315b.