Revert "* Messing around with the parser to make it work."

This reverts commit 83efcfa8f059cd2d8f47f2ab99ed4eb850e2b4d4.