change oids to avoid upstream conflict with recent commit