Issue #7117, continued: Remove substitution of %g-style formatting for