The class of combatant constitutes one of the most important instrumentalities of the law of war. Combatant status resolves critical and enduring legal questions such as immunity from prosecution for warlike acts, susceptibility to intentional targeting, and, in part, treatment upon capture. Since the late nineteenth century, codifications of the international law of war have included criteria for combatant status keyed to ensuring desirable battlefield conduct and, to the extent possible, humanity in war. This paper revisits the author's prior work on the topic of combatancy in cyber warfare. Building on recent public revelations concerning state capacity for offensive cyber attacks, as well as new developments in computer network attack, this paper highlights logical and normative shortcomings in current understandings of combatant status in cyberspace. In place of rote reliance on existing criteria intended for the kinetic battlefield, this paper proposes reliance on State affiliation as the sole criterion for evaluating combatant status in cyber warfare between States. An admitted interpretive gloss on current criteria, the proposed framework offers a workable and realistic reconciliation of humanitarian goals and emerging State practice in cyber warfare.