BS-10726
Revert "BS-10726"

This reverts commit 69430f4a39d37564d93e468d3eefc0845588e422.