Bug 868142 - keep routes decoupled from server