TDB2: make SAMBA use tdb1 again for the moment.