SSP-2668 Revert to previous code. inadvertent checkin