Merge change 22919 into eclair

* changes:
  Removing "summary"-style URIs.