Cleanup cmd on entrypoint setting

Fixes #5147
This feels like a really awkward UX change. I am -1 on it.