ARM-32 builds not working on ARM-64 machine, again