[Issue #225] Partial revert commit [Issue #109]