Fixing some lost changes.  Hopefully this finally gets around my earlier
screwup