Revert bluetooth audio fix to make a clean commit