No session, no poll (feat. Bob Marley)

Change-Id: Ia0f19c8a38b9c017238ba0e51d63bfbf67d5987d