This reverts commit 81003bc9.

Developers have asked me to revert this for now.
Signed-off-by: David S. Miller <davem@davemloft.net>