feat(controller): revert start, add cmd case

We are seeing a lot of pain points with this command, so we're
reverting back to the old behaviour.