Don't create a new session when pressing speeddial

Fixes #FS-5259 (Thanks to Nathan Neulinger for the patch)
Revert local stuff from previous commit
Don't pretend we support skinny-wait timeout (See #FS 477)