Revert parser improvements

Causes internal MSBuild errors.
Merge topic 'dev/faster-parsers' into next

b42e016e Revert parser improvements