Revert "BS-7588 "

This reverts commit 8c21eeb346f06b57060ec591b8b7fc866040241e.