using BaseParsingHelper Revert "REVERT ME Remove some diff" This reverts commit f72810088d.
f72810088d