We already cherry-picked this when we vendored d2eaa5570f.