We already cherry-picked this when we vendored b7dad11119.