Revert last change, which caused nasty sesion ID errors, although now we still have...