Convert dbi.patch to universal so older diffs can digest it