Fix the fix that breaks on android < 9