Router changes for #1073

I missed a file on the last commit