Revert to allow multiple arch compilations
2 files changed