Revert some lexer changes; using PY's lexer for now