This reverts commit 750d8065.

Linus already fixed this in his tree so just use what
he did.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>