This should fix our current CI madness with arm64 builds happening for x86-64 AND switch-id test failures.