Revert "Made loginExpired() method more resilient"

This reverts commit 78929b5d68bb6988cd66de48fcdf88ad797000f2.