We also need to make the x86_64 detection more reliable as it will give a false positive on a 64-bit arm system. @cowboyd why was it necessary to fall back to counting bytes in the first place? Is it a 1.8.7 thing?