This reverts commit ac0917f2.

Better version of this fix forthcoming.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>