Moses -- restore to working version

Haste makes waste.   This undoes the damage of the previous check-in