Roll back TOKENPTR changes and most of the .u32 changes weren't needed.