We already cherry-picked this when we vendored 6b419a0536.