We already cherry-picked this when we vendored 4e31d1a1ff.