Old lexer breaks some tests. Reverting.