Revert r52988. It broke 254.gap on x86-64.