Revert "Manta/Grouper bluetooth fixes"

This reverts commit 111d08f3361f4a4544ef6203e5d2a35953917443.