Synced up with @ericf on this. Please see [above](https://github.com/yahoo/mojito/pull/1233/files#r6080885) in `router.js`.