Bug 712763 - Backout changes from bug 669272 to keep original window order when restoring a session; r=felipe