[Bug 96344] X locks up on start since commit e8b38ca202fbe8c28