oh good point, this should be upstreamed as well.