Revert "Merge pull request #1 from Mahdi-Rom/kk-4.4.3"

This reverts commit 93d27deedf9d215ec4cb4cb5e9dbab26f7aed6f3, reversing
changes made to bc1e2663f7cddd282ca7a9b7d0ce951a54f6f519.