EAGLESIX-2651: FieldPath: match up w/ 2.6.5 code