Undid Uint32 patch as it broke a test.