Revert "#JC-1743: Remember me doesn't work for some people"

This reverts commit 11b0e75d0e6e66ba7eb7a414f0d0daca8d49a0c7.