Issue #2352641 by chx, alexpott: Break router.builder dependency.