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

This reverts commit e52780df7988b89a6679548b69318fcd738225ed, reversing
changes made to 51dfa7c9fb3c527ea1dc0ce1c9ba93809459fb59.