This reverts commit 7f32541c.

This needs reverting too, as per requests.

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