Restore escapeshellarg() calls from master.