This reverts commit 55485e7b.

I applied the wrong version of this patch, the right one is coming up
next.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>