Revert "Merge branch 'mwrock-one_session' into Transport"

This reverts commit ca2a619601a7a37840964d7e9b3a1d0b552c77e8, reversing
changes made to 2f0bca2633b619a62ce794ea9058af723dd28b0b.