Ah so your claim is that

ab571f16a675703375a363f47201f498ff41118f

is the actual fix, which happens to have its own followup fix unrelated to this