Fork: make router not require utils.js