Revert "Merge remote-tracking branch 'origin/ns.router.generateUrl'"

This reverts commit ca05538176c2a0b37991f4770c975682d7f52c4f, reversing
changes made to 107afa6e14ab8a0f2af8377685a8b8fea7166ed0.