Try to fix #26479

@snicoll This is a rough repair plan that can be used or just as a reference.

Comment From: snicoll

@weixsun thanks for trying to help but I am assigned to #26479 already.

Comment From: weixsun

I get it, Let's take care of it in there.