(parser_utils) Revert commit 68ad8b111 causing infinite loop