Yet another attempted APK fix