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

This reverts commit ed7ff3d749b6f462ae381c7ff6c086a1ccb1f3ed.
ck-3.12: merge another experimental hibernation-related patch from Con
Merge branch 'ck-3.12' into pf-3.12