Issue 6881 (FBTrace avoids restoring the session)
https://code.google.com/p/fbug/issues/detail?id=6881
Merge branch 'issue6881'