This reverts commit 8d7d9cca.

Now that the necessary infrastructure is really all there
in the tree, we can put this change back in.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>