Revert "Use RecoverySession object to hide session IDs"

This reverts commit 988c55ce67459553bad517426a924d06a89b059f.

Reason for revert: broke some tests

Change-Id: Ib43099aebc8ff025e052337475bab13445da74eb
9 files changed