Going back to the previous lexer implemention