This reverts commit b268daff.

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