Revert "consider _ as part of the token"

This reverts commit 86f72f907a081d5eeb4825c17e98d9e2a7d21508.
oops, remove reinit