This reverts commit 3552fa99. it looks like my logout fix actually solved the problem I was seeing there