Change default back to AOSP