reenable code that was disabled prior to SES-1819 fix