This reverts commit 88325aeef2. Turns out a conference with a password triggers a failed conference join. It's going to be tricky to decipher when to do actual cleanup, and where to shove that code, so reverting is easier for now.
88325aeef2