Revert "Merge remote-tracking branch 'upstream/kk4.4-caf' into berserk"

This reverts commit c9bb04d9867ca8858ec7defd987d7df5b7483fe6, reversing
changes made to ca7d825e6404d9be686c8b4dc73ab09498cdd0b3.