Revert r341665 due to tinderbox breakage

I didn't notice that some format strings were non-portable. Will fix and
re-commit later.