This reverts commit e1b6eb3c.

This was causing a delay of 10 seconds in the resume process of a Thinkpad
laptop. I'm afraid this could affect more devices once 3.2 is released.
Reported-by: NTomáš Janoušek <tomi@nomi.cz>
Signed-off-by: NGustavo F. Padovan <padovan@profusion.mobi>