SAV-504 this fixes a side effect that was introduced in my original SAV-...

...504 fix.  It also fixes AIOS-1394