We already append 000000 early on when parsing the cmdline args, let's
not do that a second time.
Fixes: #16919
(cherry picked from commit 64a5384f)
(cherry picked from commit 2239965c)
(cherry picked from commit a46a8189)
(cherry picked from commit c829f6e7)
