Revert "Merge branch 'kk_3.5_rb1.16-caf' into kk4.4"

This reverts commit 736a5da25a254a3af9b04e98b450797ddc191e20, reversing
changes made to a65afc8e2acfa511879dc77a23eb45529bc5e41e.