Merge "Revert "Use RecoverySession object to hide session IDs""