This reverts commit 4d31c4fa.

Accidently applied this to the wrong tree.
Signed-off-by: David S. Miller <davem@davemloft.net>