Revert "Merge branch 'tr/remerge-diff' into pu"

This reverts commit 08c2f78670d6640c7a88b7946bbfe91e74a794cc, reversing
changes made to fba2b28bed9b4447b5d2b1167ee6ee433f29b5da.