WIP: exploring fix for SI-6680