Revert "Use correct types to enable > 2G support" (r4238), it is