Replacing bad diffObject logic

Change-Id: I5c3ed323b25834c4b4c7fdfc52c3edd07a04dc8c