Revert "Move calculation of normalised uri to the codepath where it is actually used"

This reverts commit 1504fc60e4b676aeec2ccc3121d7462bc885545f.
1 file changed