Wip 7563

Restructuring of the log rollback logic.  See f007f05.