Revert r83395, it introduces test failures and is not necessary anyway since we now have to nul-terminate the string anyway.