commit f61f9258 upstream.

This reverts commit eab4b645.

http://bugzilla.kernel.org/show_bug.cgi?id=13002Signed-off-by: Len Brown <len.brown@intel.com>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>