Revert "Remove unnecessary router reopening"

This reverts commit 46040476a75b4470acff131f39a1391f039af422.
Merge pull request #621 from bantic/revert-router-reopening

Revert "Remove unnecessary router reopening"