Revert "Merge pull request #344 from layerssss/master". It breaks login.

This reverts commit d1da2971144fe16a7bad1da0c79d15ad91bc4a7a, reversing
changes made to 5d14219b91c82af6de7a102db75635a27fa081a1.