Merge "Move Rollback synchronisation into the Rollback class."