Revert "Bluetooth; finish backporting from 3.0.8 caf"

This reverts commit 60b0573846c2e84aaaaf9609a9fcd83038a5696b.