fixing rollback cruft