Revert accidental commits from the xquartz tree