Removed usage of canonical path.  Causes 302 redirect to public_url... M...

...ight as well use the public url straight away