Revert "Rollback Bluetooth changes for now."

This reverts commit 9e9dbbc5ce1f14abf73b4c2fd0e84dfbb8560101.