Merge "Partially revert argument escaping."