This reverts commit 52d01c2f.

the UINT64_FORMAT bit broke the b uildfarm, so I'm reverting the whole thing pending further investigation.