Revert "Merge branch 'lexical_analyzer'"

This reverts commit 96c9783ef58d195c6ca2a5fd3fbdccb0c86eb2a9, reversing
changes made to 0c8ccf7b9894c589485666649392b767f32734d1.