Cherry-picked changes overwritten by merging with upstream.