rolling back changes to Trie CharMatcher since it breaks other tests, th