This reverts commit a2f27217.

I applied the wrong version of this.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>