Track our own Tuna thats fixed for some aokp features.