[x86] Restore the bitcasts I removed when refactoring this to avoid