Fixes #5677, #5678 moves bc code into Router::route