commit f5822754 upstream.

This reverts commit b292cf9c.  The
commit that it attempted to patch up,
b0401d72, was fundamentally wrong, and
will also be reverted.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>