Reverting parser to last working state: #MSG-75 in progress

This reverts commit 47e9816d1af03a07433709c012c0ec6993f33c2d.