Reversed the changes made for introducing Session.speaker