Rolled back grammar definition to match the grammar that is being used.