We've kept this around a lot longer than we should have. This reverts commit 94c7fda779.
94c7fda779
common.CurrentArch()