We already cherry-picked this when we vendored 847fe79059.