This reverts commit e1f7107c. This broke -e <cmd>. Since this was just to simpify code, reverting for now BUG: 395555