backout 3c552ee3aa5e to fix commit message
Bug 896092 - Restore session when returning from guest mode. r=bnicholson DONTBUILD