This reverts commit f1d5ca43, reversing
changes made to 4933d85c

.

I applied v2 instead of v3.

Signed-off-by: David S. Miller <davem@davemloft.net>