Revert "Check if Diff is an array before accessing field"

This reverts commit c1afe8b638a1cf0ee5d56253108a800a5582293d.

Change-Id: I8c5559565bc705198e55677211fb01c924e6f1b0
Merge "Revert "Check if Diff is an array before accessing field""