I think it'd be clearer to use git revert and its auto commit message? You can add some additional notes to it then but otherwise it's a plain revert.
I'm not sure the comment is really worth it, I got confused in the original MR because I mixed up target window vs sent window but that's just my fault, and I'm not sure the comment really helps. We don't have comments for other root_window uses, so IMO it misleadingly makes this one special.