I finally found how to do it (whined about this last summer in bicycle world).
Boraxo 20 Mule Team, added to the wash. Not 100% cured, but much, much better.