Removed x86_64 hack