Revert "DifferenceEngine cleanup"

This reverts commit 1f423cc6091867371dc31009187d5cdb04142ff7.

Change-Id: I2254eb37376063a081ad89481654b735fb0360b1
Merge "Revert "DifferenceEngine cleanup""