MFS r285863 (jhb):
Partially revert r284034. In particular, revert the final change in
this MFC (281874). It broke suspend and resume on several Thinkpads
(though not all) in 10 even though it works fine on the same laptops
in HEAD.

PR: 201239
Reported by: Kevin Oberman and several others
Approved by: re (kib)
Sponsored by: The FreeBSD Foundation