[KitKat] Revert 25abb7ace77be2ad3c52df93dd7044d50b8fee1d