Reverted some Bluetooth changes