R: manually fix things after patches got applied
This prevents conflicts in case a patch changes the same line
authored by Sandro and committed by GitHub 4 years ago 00a52ef6 8dfdd0e4