bluez upstream went with a different patch