ae34c85a87
Still paying the cost of not having refactored all architecture handling in the 3.x branch so we have this broken hybrid of arch/bits which is unreliable.