Revert "Merge branch 'SessionDialog' into development"

This reverts commit d0ef56411e8e8b9ef22991438b50971b1c86deb3, reversing
changes made to dd6ab81cba061f68981ffe254ae0639726e08527.