SSP-2664 - re-implementation of a fix for this ticket that was clobbered
by subsequent checkin.