This reverts commit 584ec122, which
was commit ddfadd77 upstream.  It
causes boot failure on 3.2 although no such problem occurs upstream.
Reported-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Dan Williams <dan.j.williams@intel.com>