Fix issue #1.  Reverted a considerable amount of clean-up.  No time
to track down the actual error right now.  This gets it working
again.