Revert "Fix crashes on Android ports"

This reverts commit f5adbd83172bcbd3d3cf8deceaf23ea25edd84c9.