Adapt Soledad bits to latest API.