Revert "Begin attempt to fix identity switching issues"

This reverts commit 6f523dd4c28f4e9b47f0654edea669c5bf83f179.