Revert "GPU: merge with CAF kk_3.5"

This reverts commit 60f9320d8c46fcbc899323ceaa2f2adb70728ce7.