Hi Everyone,

This is a second iteration of

https://patchwork.kernel.org/project/linux-pm/patch/4892163.31r3eYUQgx@kreacher/

split into 2 patches, one of which is just a trivial removal of a statement
that has become redundant after recent changes and the other contains the
rest of the original changes.

Thanks!