Revert "Remove Parser fallback code"

This reverts commit b05c98968385c433ca2d87683789f1b27798f367.