Fix deindex array walk.

@bug W-1831607@

@rev tbliss@
Merging origin/goliver/master-pending-fix-deindex into master