Backported indent-encoding fix.