Revert "Workaroudy BS"

This reverts commit 9230e914dcff5d5606ee48f00ec35030c8216a07.