Revert "Changes for kk4.4 and optimizations"

This reverts commit b3531581ef56594571b857c8fac9b8b39a7de80f.