This reverts commit 3b6af31a. Reason for revert: Missed a change to allow system to abandon sessions Change-Id: Ie2ab28b4830508eddc67095aac8efabb265eca4f