Revert "Merge remote-tracking branch 'slim/kk4.4' into ose"

This reverts commit 544ecfa3df12e7e95739a169608e5cfbe8bf62cd.