Revert to use []byte as token type