re #2327 decoupling of router and history