Partially revert 4c933fb where `#to_s` was changed unintentionally.

cc #44 
This will break the build. We are expecting the query string too.

But `path_query` is not present in ruby-head. So maybe we should use `"#{path}#{'?' + query if query}"`