Revert "Fix crashes on Android ports"

This reverts commit c58047ce86c2f65d8561c7ae7340429808a2acaa.