Revert "logout"

This reverts commit e45ce2ea3508b3568d4fdc672e33408e8db2ecb7.
Revert "Revert "logout""

This reverts commit d22ad582d66b4ab688662549db9502a1d9dd4800.