@henry's fixing #42742 (closed) upstream, replace any local fix with the upstream patch once it's merged.