Another fall-out from our rewriting of argv[] now. Fixes: #12782 (cherry picked from commit 98dc9d1f)
mentioned in commit db03cc80