Revert "Revert "Diff""

This reverts commit 5489e239506007ea92a3b8d54bc5bbf21215d59c.