Revert "CYB-189 Refactor session initialization"

This reverts commit 32f2820160f24c5c9afdaa05c13cd0fc423e80fd.
Merge pull request #122 from coyote/revert_session_initialization_refactor

Revert "CYB-189 Refactor session initialization"