Revert antlr fix