This reverts commit e00be9e4.

It causes warnings and has several problems.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>