Revert: bluetooth fix