[KitKat] Prefer http://review.cyanogenmod.org/#/c/53622/ over my patch