Revert "Rollback Bluetooth changes for now."

This reverts commit abf66847cc824ac09aef80ba3d0059c8fafad865.