Backed out changeset 7102647c1ecd
escape two more places where '%zd' is used