This reverts
fix endless loop error: 865b5caf
which was a partial revert of
AppendAscii cleanup: b7df3446

AND fixes the original error in "AppendAscii cleanup".

Change-Id: Ida29af046b277170388e4945c0cdb4ec6116be98