Brought inline with aokp