This reverts commit 203191c3.

A better version of this fix is forthcoming.
Signed-off-by: David S. Miller <davem@davemloft.net>