Revert "Bluetooth patches ( dh-harald )"

This reverts commit f4008a175f2673faf3e198af89b256d139b7e537.