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

This reverts commit 09ad291181c4f979bd9d012bbe1af68ea006564c, reversing
changes made to 4651cddd8fcc62ce9426a9eb4987a9c90f4cce8a.