Revert "block: fix accounting bug on cross partition merges"