This reverts commit 57688350. Need to conditionalize for ARM targets, this is failing on machines that don't have ARM targets.