complete rollback, fixes #448