Merge "dm: Undo diff from upstream"