Rework partial packet handling once more