DB/SAI: Still At It

By dr-j, closes #8008