Reverted changes to tokenizer.py; This needs to be debugged