Could you please revisit this?

I still see the problem at least with core-8-branch (didn't check with trunk or any other branch).

It appears that the fix [58c46e74b931d3a1] that I confirmed to work got changed later (see [e94a8f9c8f9a6950]) and this changed fix is what was merged. However it does not work for me.