Revert "Try to retain original structure of URI."

tests/corelib/uri_query_test.dart

Index: tests/corelib/uri_query_test.dart
diff --git a/tests/corelib/uri_query_test.dart b/tests/corelib/uri_query_test.dart
index 6ec657cdbe9355ce5b6e62dd001b21f3d1f64140..bb21f9bc0de206ddd9216c2ece36a9e5b3783eef 100644
--- a/tests/corelib/uri_query_test.dart
+++ b/tests/corelib/uri_query_test.dart
@@ -23,7 +23,11 @@ void testQueryParameters() {
     if (normalizedQuery == null) normalizedQuery = query;
     check(uri) {
       Expect.equals(normalizedQuery, uri.query);
-      Expect.equals("?$normalizedQuery", uri.toString());
+      if (query.isEmpty) {
+        Expect.equals(normalizedQuery, uri.toString());
+      } else {
+        Expect.equals("?$normalizedQuery", uri.toString());
+      }
       if (parameters.containsValue(null)) {
         var map = new Map.from(parameters);
         map.forEach((k, v) { if (v == null) map[k] = ""; });