Revert to a couple AOKP repos