Revert "Revert "Rollback Bluetooth changes for now.""

This reverts commit c8daa48026ec677bc91472eb8a1613c8c84bf615.