This reverts commit 6ae3983b.

The next patch is the fixed version of this patch.
Signed-off-by: Tony Lindgren <tony@atomide.com>