Revert "Rollback Bluetooth changes for now."

This reverts commit 0f697c7687ca57a255c3bd2a579aea990d65d1fc.