Fix fallout of previous change on x86/Linux