Returned to pure AOSP