NOJIRA: repair code damaged by attempt to deal with merge.

accidentally commit the unmerged version of the code... oops!