revert some int64 changes