Really fix the previous sdb changes.