Remove hacks from hibernation bug fix per release v4.24.2

[delphidabbler]

@SirRufo provided an alternative fix to the hibernation bug:

I just made some code changes to get rid of that hacky code. You may have a look at https://github.com/SirRufo/codesnip/tree/hotfix/hibernationbug