Session restoration doesn't kill terminals on logout

I don't know if this is intentional, but if you logout and log back in with session restoration enabled, the terminals are not killed. However, they will be very broken (I get errors like No user exists for uid 501 when using git and User aaronmeurer has no home directory when starting emacs). Typing logout and restarting the session fixes everything.