I'll close this here since it's unlikely we'll fix this downstream. I've commented in the upstream but and subscribed there