Revert "WIP: exploring fix for SI-6680"

This reverts commit 0953a48fd6fcdc1e6befb6272fbfea40f54f5032.