Revert "BS-937"

This reverts commit d03ad3aed40a3a9c4a8c8def2106a8998d4e9be4.