Go back to using new KitKat APIs in some cases