Reverting because detecting architecture size doesn't work on all platforms. This reverts commit eaf73293.