OK.  Should we do the same in oo-accept-node?