Restoring working code

Worked fine before. Refinements caused problems. Ain’t broke so don’t
fix it. Moving on.