This reverts commit e0511f6c.

I commited the wrong version of these changes.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>