Revert "Bug 910140 - Adapt to the bluetooth API changes"

This reverts commit 8372b0e6845b36861f841b93f9a9f45d501929b5.