Merge pull request #980 from kwhatmough/next

Restore optimization. BT_USE_NEON was preventing it, and is not needed s...
Merge pull request #981 from kwhatmough/next

Reverts my last commit until I can fix the runtime issue with neon