Revert "Improved performance of current token highlight"

This reverts commit 8f5d4b1f5f2be9952be0880a248379e8819aae15.
Optimized current token searching