Has this been upstreamed?