This reverts commit 41cc3cea.

Oops, my mistake, I was diffing wrong branches.
Signed-off-by: Tony Lindgren <tony@atomide.com>