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

This reverts commit 1aaebcd8f813dd3a427f1740fc2cc98cea751b07.