* commit '9ca86a61476b2c6f33392400ced14cf43ee589c1': Don't crash good-citizen restore session clients