Fix datasource field order

Despite appearances of the contrary, fields in the datasource
have to be listed in the same order as the columns appearing
in the tsv.

Change-Id: I2e866fdb09c5b866a7873379949136f2785afeec