Revert "BS: more fixes"

This reverts commit 092b2b99c2c97abf5c2a66cd8967777530425e1f.