Revert "Fixes pairing and unpairing issues with BLE devices"

This reverts commit d153274d79474eb9a682e7810b3aa42104c4adb3.