Revert JUri references to allow JUri object manipulation in router