Remove that X.org specific code from the core.