Rebase to nokogiri head and reapply Hawk's Xerxes patch.