Regression in restaring an x11 session

See !2445 (comment 1745867) for details. This is mostly as a reminder for me to track the down the issue and send a patch.