Revert "Revert "Remove Parser fallback code""

This reverts commit fcfcfe178cb7579e3a4ede1523c6ee982efcb928.