[BUGFIX beta] Sync router.js, get rid of derelict async hook
Merge pull request #4739 from machty/omg-query-params-are-done

[BUGFIX beta] Sync router.js, get rid of derelict async hook