This reverts commit 7d3d5ec1.

Russell is going to merge this in via the ARM tree.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>