Revert "BD changes"

This reverts commit 18056adf8d0b35711a30ace5ca4e02c46f1eb39f.