revert change regarding anonymousUser handling