!UPSTREAM: WIP fix for 72026