Re-add arm64 support changes

No match.