Update to the latest Eonasdan submodule and remove the related hacks from the generator
Merge submodul update - related hacks has been removed from the generator