Revert "Fixes pairing and unpairing issues with BLE devices"

This reverts commit 7b6a6b41d16d618c52a86ce8d3406b17ee7e7329.