Revert "use standard archs to build" and fix it for good

This reverts commit 626ab7cf0c3fe623b3e6c6ffa04ce34a40b7967a.