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

This reverts commit 1f024939547d64af35adb5506a4f0bb539d104de, reversing
changes made to f07976174d9a79e3b7aa0a2aff56c8f2c0f84356.