Hmm, OK, so it seems like I was getting confused again. With the H-scenes disabled, Jack's version also uses the RN version of all of the sexual scenes, so the stupid "Shinji beats up Sakura and she reacts for some reason in total contradiction to how she has behaved for the previous two years" thing is in there. If you want a sensible, well-written version of HF that makes sense, you need to enable the H-scenes. Just a warning for anyone new who is thinking of trying it, if you turn the H-scenes off you also ruin the story with lazy censorship of anything involving sex.
By the way, to explain, my issue with the Shinji death scene censorship is this. Sakura doesn't kill Shinji to protect herself, her mindset is too broken for that. She kills Shinji because he threatens to tell Shirou he's been raping her, and she realises that Shirou's reaction will likely be to kill Shinji. That works because being raped can (unfortunately) have negative connotations for the victim, and Sakura's mindset is such that she actually sees it as "her fault" in some way (that is shown multiple times previously in the route). Conversely, "Shinji has been beating me up for 4 years" does not have the same negative connotations, and thus Shinji threatening to tell Shirou that makes him just come across as suicidal, as opposed to a misogynistic idiot who doesn't appreciate that even Shirou's willingness to look for the good side in people has limits. So, there is no in-character reason why she would actually fight back, particularly since she went to the Matou house with the expectation of dying.
