Remove an unncecessary loop from validation code

It looks like an additional loop was included, probably due to some
cut and paste issue.

Fixes:  bug #1220461

Change-Id: I96c6944b2081263967af0cc69617ca622a1c5a61
Merge "Remove an unncecessary loop from validation code"