Revert "Merge commit 'a5f9c21cc04b70b4bc9771cc944760653377ab5a' into kk-4.4.x"

This reverts commit c988634c623f29ae7a6604eb9e0921a71720f4a6, reversing
changes made to 608aef08ec209dff11363cbac8d224fd627c6a46.