This reverts commit 16468c78.

Bisection showed that it was the root cause for a resume hang on a
bog-standard all-Intel laptop (Sony Vaio Pro 11), and reverting fixes
the hang.
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>