Roll back residual debug changes.
Use more of libsbt.