yeah, good catch. I had done a manual merge without looking too much into the change.
And looks like this codepath in general has been modified a bit since then ... let me see if anything else is also impacted. Thanks !