Revert "Merge branch 'danbev-AEROGEAR-885-login-issue'"

This reverts commit 17bb09e93281bf238dad9eff75cfb5a12efdbe01, reversing
changes made to af00eb08a49a328c8841106adc9d2fcdffe29f4a.