diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c
index f4b1ef95e9e..9b6ab248106 100644
--- a/src/bin/pg_amcheck/pg_amcheck.c
+++ b/src/bin/pg_amcheck/pg_amcheck.c
@@ -1226,15 +1226,10 @@ progress_report(uint64 relations_total, uint64 relations_checked,
 	if (relpages_total)
 		percent_pages = (int) (relpages_checked * 100 / relpages_total);
 
-	/*
-	 * Separate step to keep platform-dependent format code out of fprintf
-	 * calls.  We only test for INT64_FORMAT availability in snprintf, not
-	 * fprintf.
-	 */
-	snprintf(checked_rel, sizeof(checked_rel), INT64_FORMAT, relations_checked);
-	snprintf(total_rel, sizeof(total_rel), INT64_FORMAT, relations_total);
-	snprintf(checked_pages, sizeof(checked_pages), INT64_FORMAT, relpages_checked);
-	snprintf(total_pages, sizeof(total_pages), INT64_FORMAT, relpages_total);
+	snprintf(checked_rel, sizeof(checked_rel), UINT64_FORMAT, relations_checked);
+	snprintf(total_rel, sizeof(total_rel), UINT64_FORMAT, relations_total);
+	snprintf(checked_pages, sizeof(checked_pages), UINT64_FORMAT, relpages_checked);
+	snprintf(total_pages, sizeof(total_pages), UINT64_FORMAT, relpages_total);
 
 #define VERBOSE_DATNAME_LENGTH 35
 	if (opts.verbose)
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 7296eb97d01..669aa207a3c 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -804,14 +804,9 @@ progress_report(int tablespacenum, const char *filename,
 	if (totaldone / 1024 > totalsize_kb)
 		totalsize_kb = totaldone / 1024;
 
-	/*
-	 * Separate step to keep platform-dependent format code out of
-	 * translatable strings.  And we only test for INT64_FORMAT availability
-	 * in snprintf, not fprintf.
-	 */
-	snprintf(totaldone_str, sizeof(totaldone_str), INT64_FORMAT,
+	snprintf(totaldone_str, sizeof(totaldone_str), UINT64_FORMAT,
 			 totaldone / 1024);
-	snprintf(totalsize_str, sizeof(totalsize_str), INT64_FORMAT, totalsize_kb);
+	snprintf(totalsize_str, sizeof(totalsize_str), UINT64_FORMAT, totalsize_kb);
 
 #define VERBOSE_FILENAME_LENGTH 35
 	if (verbose)
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 2ac4910778b..69ea2143378 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -759,14 +759,9 @@ progress_report(bool finished)
 	if (fetch_done > fetch_size)
 		fetch_size = fetch_done;
 
-	/*
-	 * Separate step to keep platform-dependent format code out of
-	 * translatable strings.  And we only test for INT64_FORMAT availability
-	 * in snprintf, not fprintf.
-	 */
-	snprintf(fetch_done_str, sizeof(fetch_done_str), INT64_FORMAT,
+	snprintf(fetch_done_str, sizeof(fetch_done_str), UINT64_FORMAT,
 			 fetch_done / 1024);
-	snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT,
+	snprintf(fetch_size_str, sizeof(fetch_size_str), UINT64_FORMAT,
 			 fetch_size / 1024);
 
 	fprintf(stderr, _("%*s/%s kB (%d%%) copied"),