s4: Revert "r24284: change brlock_tdb.c to use the dbwrap API. This actually makes...