Sync router.js - Closes #3153