Revert x64 fix