Reverted export to use OID as rowkey so like that the samples in README work and make it a configurable option