Revert "Improve session mappings."

This reverts commit 601c6edd83a00613a2afa74e18155b419cfc77e0.