Revert "Kernel/power backports from CAF 3.4"

This reverts commit 447b5e40c80db13561bc35f79ef94f3e8f080936.