Revert to allow multiple arch compilations