Fix broken shell support
When we fixed the issues with the new SuperUser Daemon mode, we also broke support for some shell types. Let's get this back.