Re-commit x11 support