Reverted a change in Uri.Path that caused problems.