Brought inline with AOKP