NXP-10308: partial revert of 9b6823b0e2275de4b0c016e5702133fbe094edab to restore standard hibernate behavior