We already cherry-picked this when we vendored 218b56e516.