Revert "Changed routes path handling"

This reverts commit 800b5fbcfde6107cc66dc26475caf5237091a29d.