[sdb] Another try at fixing #25009.