diff --git a/lib/capybara/query.rb b/lib/capybara/query.rb
index 0e418558c..238727cdd 100644
--- a/lib/capybara/query.rb
+++ b/lib/capybara/query.rb
@@ -17,12 +17,7 @@ def initialize(*args)
       end
       @selector ||= Selector.all[Capybara.default_selector]
 
-      xpath = @selector.call(@locator)
-      if xpath.respond_to?(:to_xpaths)
-        @xpath = xpath.to_xpath(:fuzzy)
-      else
-        @xpath = xpath.to_s
-      end
+      @xpath = @selector.call(@locator).to_s
     end
 
     def failure_message(type, node)
diff --git a/xpath b/xpath
index ddbf50ef7..a31816d86 160000
--- a/xpath
+++ b/xpath
@@ -1 +1 @@
-Subproject commit ddbf50ef74c4655207ce1fc8c4ec62cef38a7789
+Subproject commit a31816d86ad341962aa1019e08f5835daad87b8c