It also reintroduces a missed hack (undocumented commandline switch
-disablexineramaextension to fool clients into thinking that Xinerama
is disabled even though it is not).

That hack had been dropped in d26930d5 intentionally.