Revert "ck-3.12: merge another experimental hibernation-related patch from Con"

This reverts commit 96b4f821cb84370e5989dc6e3cb7092ba6498386.
ck-3.12: suspend fixes for BFS 443
Merge branch 'ck-3.12' into pf-3.12