Is there an upstream issue for this?