Somehow plain diff is not applied cleanly