Revert "updated parser to handle HO terms better": parser fails on some
problems

This reverts commit ba65a702d2c71f39d5d99043fd670f8e2f8caa5d.