Revert: 8225ccba

Based upon a report by Yan Zheng.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>