Revert "Fork : WIP BASS locking rework."

This reverts commit 5d1e98b4cc97a0e184e0fbdc888112dfe4b5bbb6.