Flip the field mapping around

This makes it possible to map from more than one external field to
the same normalized field.

Change-Id: I5398f0c34cc89adfd9af152d0d06adcefcdbd0f5
Merge "Flip the field mapping around"