Need to work around #7799 on all i386 platforms, not just Darwin