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

This reverts commit 8f55e5d31c25e5bc92a3f4dc2616692adbd94957, reversing
changes made to 84cabefe3b34a196d48c7bd473b1f928e6215143.