Revert "Merge pull request #2168 from mtwebster/bluetooth"

This reverts commit af018f90a3484f220ad277ab9ff8a934b0ed2f06, reversing
changes made to 39ccd1f2426689be82d3930e027edfba24abe03e.