Revert to Soledad 0.5.x api.