Revert "Fixed bug #64604"

This reverts commit b05c088a3abf8e4c6fb6e40418423a9e2dd3d929.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
add a test case previously broken by a bad fix
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
update NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
update NEWS