Well said. It is horrible that he mangled the joke. It would be funny if Avi Hoffman told that joke
It think it would have been funny if he (or anyone else) told it with any non Jew hater coming in from his desert camp to buy a goat for a wedding feast.
Telling it with a Jew hating Muslim terrorist, wandering in a desert & desperate for water, made a victim of America's & Israel's Islamic terrorist enemies and made America's friend Israel a villain.