Remove uint64 bitshift workaround